more fixes to timeline events