Remove renegotiation. Fixes #38
Clean up wording per MT