Changed the macros a bit.  Added 4 more.