Some minor changes, added list.TODO