Minor fixes, also made it into a 3 team battle!