Cleanup and 2v2 bugs