Added badges and modifies usage