Update scanner and add first lexer draft