Update MR bases
Fix bignum / Calc issues (things turning into BigFloats)