Movement

Fixed some movement issues