added config defaults and other small improvements