Minor improvements, increment counter.