separated configs, bug fixes
separated configs, bug fixes