fixing timeline bugs