more stuff in lexer
merge