added comment macros