fixes
Changed regex splitter to full lexical scanner to allow multi letter words