Fixed the charts, added some todo items.