badge refactor, notlucky boost fixes and 3 new