Cleaned up the Negotiator a little and tossed in the changes to supFavor