US #21: Improve comments and descriptions of USs, Tasks and Issues