Misc tweaks.
Tweaked modulus based on Derek's feebdack.