Bunch of fixes and some badges