Readded #ifdef DEBUG to all debug prints.
Some small testing changes.