Re-enabled logging.
Some tweaks to protocols.