misc updates for NLTK 3