Add config options. Format, cleanup. Back to default values.