Fixing commands + team names