Moved some things around on layer 1 so that transparent keys can be used to hit modifiers on layer 0.  Fixed issues with two of the macros.