Some protocol fixes, some code. Nothing really interesting yet.