Additional changes from Rachel

@rjgrubb, may we consider this complete for the time being?