Add comments, reorder slightly.
More grace to velocity handling, configurable.

Before full revert or recode: a moderate (smaller than
before) minimal grace amount for the counters is used now.