Initial fixes for contact/negotiation behaviour, including work on greed-priority bonus