more fixes to timeline