updated bokeh plotting
merging