Some bug fixes, all works except config values