More changes, fixed counters.