Adding config options, and debug lines