Major fixes plus car names included