Added additional error controls
Improved configurable debug verbosity