fixed some timeline issues