simpler Trajectory data structures, style adjustments