updated movable and player to correspond to uml