Comments and other improvements.