Quick improvements and some affix-testing stuff.