Attempt to clean and fix network code, server-client chatter is strange