Fixed formatting and made minor changes to teams

Courtesy of @HelmOfDismay