Improved the module loading modules a touch.