Added counters to all activities which were missing them. Minor refactoring on Issue #83