Histories are synchronized

Fixes #289.
done.
The comments get messy indeed.