Add timers to counters
clean up junk some more
Add kind field to feed counters, clean up some stuff
Various fixes