fixes on timeline