updates regarding PR comments