add bokeh; lots of formatting updates