comments, minor modifications