added custom modules, some config edits