Beefed up the regex for lexing