cleanups and adding more badges