comments and minor fixes