updates to enrichcalc