+2 badges and fixes