Add debugging macros + use them