Regenerate plots

Make final publication plots - updated code for bugs