A few nit-pick-y changes & comments from reading code