Code cleanup + fixed joining full game.