more badges and fixes