Condtionals_Wacky Calculations

Corrected calculation and input validation to work correctly