all debug code now properly wrapped by ifdef statements

oops