added config, bug fixes