updates to module loaders etc