first pass at addressing reviewer comments