more data/value fixes
0.6.4