bug fixes + config enhancing