Split up MOD() into M() for many and O() for One. And some other fixes.