Fixed some bugs with the new TimelineJS engine

It looks promising and hopefully I don't have to start from scratch....