fixing move commands, to simplify code