1.2

Minor changes - comments added, unnecessary commented out code deleted.
Revert "1.2"

This reverts commit b862e52aaebb131b710752947a401721587cb54e.
1.2 - updated comments