Updated debug macros
updated macro usage and definition