addressing some pr comments