changes to HistoryExchange (see Issues 19 and 20)