Added nonzero q_w for 3rd boundary type

Also added colorbar to plot.