bug fixes, move and canMove
Merge fixes