Minor changes in TODO section