more remarks addressed and more cleanup