fixed the macros a little