fixed some of the move