Did some more work on the module system.