Comments and minor fixes.