Fixed a few bugs / using badges
left one off