macro modifications

Here for you to take a look at.  Willing to discuss/debate merits of any of this stuff.  Reverting is easy enough.