fixing up dicts + macros
syntax fixes