Corrections for the sample data and added some TODO items.