Major fixes to history. Needs more work