bug fixes, move and canMove