Bug fixed and badges added