new lexer keywords

Closes #1