updated internals to fix timeline bugs