added more generality to output trajectories and made that interface more accessible