yotam: bug fixes in data.