default: comment touch-up (solves issue #97).

Implement suggestions from Todd Partridge <toddrpartridge@gmail.com>
with some extensions and modifications.