Fixed up movement mechanics (broke them in refactoring effort.