FIX/BUG: Implementation misunderstandings.

Fixed some misinterpretations of M&R(1985) but getting some Inf values
during the calculations so something clearly still isn't right!