Simplified the Logic on for counters

Simplified the logic for some of the counters so they are booleans,
also added some debug console.log statements  to verify changes.