17: add NAME, NEWLINE, and missing operator tokens