Add numerator, fix last two MOE calcs, remove cruft.