Updates to make server more stable and better handle disconnections