Lots of build fixes and modules additions