now using lucene stopwords. misc cleanup.