Macros Updated

Some other random stuff that I found that was useful. Didn't take
anything out, just added some in.