cleanup of Perf Counters; gen almost working