Calculations now correct.

No monte-carlo yet