- added some debug macros