http2: update after second review