some addons and refinements to wordlist etc.