Add more on protocol issues, ready for review #94