Bugfixes.  Admin macros still tweaked… too many layers.