Slap Counter
Mode Counters
fix some pluralization issues for types