Fix spotlight's bugs + work on timeline