Some rolled up changes, multiplayer support