One movement per turn now
Fixes and cleaning up