fixed, back to values, use pandas, simplify things a bit