Improved the word list configurability, just a bit