remove *-gram labels from data
new macro strategies from DDR night
update TODO