Added some more Configuration options. Added Debug