Corrected some bugs with the timeline saving