Small changes to champion and fixed some bugs