Working multiple players, simplify fix for window close bug