more compound replacements
updated macro defs
more templates