pr comments fixes