Fixed Hammer, mainly.  Some tweaks in BaseMod