More fixes. 4-digit padding for count.