more fixes
badges
stuff