fix stoplist, add test and map
update tokeniser
getopts for parser