fixed all macro glitches, need to fix tests now