cleaning up
premerge with y-p
premerge chp1
merged y_p changes + updates plots.