Various additions to comments