speed improvements.
changelog merge corrected.
Merge pull request #410 from opf/fix/timelines_speed