History now works mostly properly