Comments on latest changes for VIP

The purpose of this pull request is simply to provide my line-by-line comments on the areas where VIP might ask for changes. If these are addressed proactively, it may speed up the process.
Not sure if they'll want this to fire on VIP or not, but I can't say for sure.