comments, minor fixes