Severl small bugfixes, some new config options.
Changelog bump.