misc updates, streamlined comments