ammend wordlist and refactor parser