Update plotting code to match final figures