Some final changes to the server, pre-encryption/decryption