More fixes to structural words
Some cleanup