More Debug output controlled through DEFINES