fixed some macros, added definitions to macros for ease of reading