Fix friggin calculation errors