minor chnages and deleted TODOs. We won't do badges which is nonsense.