Appended TODO list, minor changes elsewhere