Your method of calculation seems much easier to follow. You're right about the inconsistencies.
Unfortunatley I had thrown out the previous version before I read this latest. I do seem to recall the earlier version to be more straightforward.
------------------
-.-- --.- -..-