Added uncertainty plot, other minor tweaks