Lots of fixes

Movement, mainly.