Comments and minor fixes