fixing the module loading and such