more stopword bugfixes