more pr comments addressed