A few minor corrections/tweaks to your PR.