fix addTeams and some indentation prettification