Adds a few comments, and doublechecks the merge