Added Hatchback Sport + other fixes