Fixed lexer read past end issue. Also updated 'sql' keyword.