more multiplayer stuff
Merge with master