Minor commenting & one fix.

The fix doesn't fix a bug that exists now, but it would have made problems down the line.
Merge remote-tracking branch 'origin/master'