changed the syntax of the first 10 or so macros