fix timeline bugs