conclude first pass of fixing remarks