Comments and minor bug.