fixed timeline bugs