Fixing the double counter issue
Making the listeners and the intervals kill themselves when needed