Added badges
Some minor fixes