Moar changes and fixes. Notably badge count now resets