update dict to hold tk_value, tk_name. seems to be overly-complex but whatever, i committed.