fix discussion, add To Do, remove W.A. case.