- fixed a couple of bugs post conversion to macro