grammar, punctuation, and tweaks in 1.2--1.5
unify some macros