Mostly minor code cleanup.  Tried to make a RingMod and failed.