minor changes to the protocol,  todo's removed