fixes
edits in module system