I'll work on this and make some adjustments (some of your calculations are misplaced IMHO).
When I'm done with the corrections I'll share it with you.