SonnyJim More work on macros/general cleanup