Fixed a few bugs that occured when swapping out timelines