Small changes to plotting codes