Reviewed, lgtm with a couple of comments