Cleaned up Vehicle-derived classes to be much neater, vehicle entry works a bit better