some further simplifications, full word list included