made more changes to wacky calculations

made changes to wacky calculations