Add lex and handle semicolons correctly