various edits, though primary changes occur in handling trajectories