Fixed vehicle offsets..
Cleaned up some code