More commenting and some editing of cases.