cleaned up & updated config options