Added Sport and fixed some bugs