changes to module manager
some has been lost; trying to restore
pushing to dev branch, as this commit is broken