Fixed server concurrency bug and added message uploading