The Motorcycle: Hotfix #5

Few bug fixes