Some more inline comments and minor changes.