timeline fixes
Merge pull request #88 from Jackyjjc/timeline

timeline fixes