Move improved

+ Fixed some errors with moving.