More work on history and pending txs