little bugfixies, added config options