fixed some multiplayer issues
fixed merge issues