Changes to the class files to all turning debug messages on/off