cleanup, got tests working again
use track new macro on match
handling new round too