Add badges and tweak stuff