Fixes to movement, and trailrent