Minor fixes

These should be super minor changes to the modules.
basically, why bother half-rewriting this as an old-school module