fixed some timeline related problems