separated the manipulation of the timestream from the navigation through it, and fixed bugs