Added counters and various other goodies