update parser/pp
ooops, I should really separate terms and values...
update tests