Updates per comments

Also rebases to HEAD.