Amendments following feedback from Drew

Amendments following feedback from Drew.