Updates per review

cc @domenic