Did a whole bunch of stuff, mostly improved the module system
Few changes.