Fixes in this version include:

1.      More changes to negotiation code.