only add keywords that are not stopwords; also some tweaks