Bug fixes, a little refactoring
New config entry; small adjustments to logging config