More fixes including horid math problem (dividing instead of multiplying)