resolved some bugs, move still have bugs
Resolve various bugs in Move.