Patch 1

Added support to up to 16 teams. Also a small OCD fixing some weird indents. Again.