fixes to first draft of protocol