include champ skills + bug fixes