Last of the nitpicker note fixes. Added some inline commenting.