refactored movement system, enhanced tests, fixed geom bugs