Fixed some lexing problems. Removed regex