more fixes for timeline, needs a bit of refinement and testing