tweaks

mostly just names of things.
but also, ensure eval_exp only returns sets of values of the same type.