Fix of move command

PLUS A LOT OF SHIT