Correct & clean up numerical formulas

Also remove some equations inline to save space.