Added TODO list. Other minor changes.