Comments and other improvements.
More progress...