- further lexer corrections