nv_tok becomes nv_term + renamed some variables
Added some fields to nv_term to prepare an AST