history working (mostly) properly now