Fixed traj and bokeh things. Still having issues parsing