improved history

oops, I should change that before we merge