Fixes

Responsive switch and loop counters