timeline fixes