Some more changes to movement