(4b) - Mostly added and removed to-do's.

Minor changes to description.