fixed move calcs