Fixed errors

Fixed errors related to moving around