Additional work on comments -- more to do