Fixing moduleManager.use and some tweaks