Fixes and starting negotiation and history