bug fixes and new config