Made some bug fixes.

I missed some bug fixes with the way that the Car class was using map code in my earlier PR.