Comment fix ups.