Comments and minor updates