Modified TODO and changed dates