More todo list updates. A little more cleaned up