bunch of testing changes and badge increments