Corrected various unit conversion errors.

1. Should not have implemented like this
2. Should have converted everyting into SI units.
3. But then again hindsight is 20 20