Couple of fixes to the data and some todos