done

About the Wagon R, indeed I would also rather consider it as a MPV, but I'm not sure what is the "official" category (well, there is maybe not really one)