fixed some macros.