fixup new starr
wip macro engine changes