Fix tokenization to be more sophisticated then just 'words'ing. Lack of spaces is now acceptable