Counters animations
Clean up + better handling of maps