minor changes, Term now keeps some extra information about types and line numbers, fixed parser a little