Part 1 some fixes for history

see individual comments