upstream change now permits empty interior string
Add word model finally; improves performance a lot