fixing up for timeline changes and a crash bug