Clean multiplayerloop

merge multiplayer loop back into the original branch