New comments and minor fixes