updated debug macros