fix output
added a new group and more counters