changed some stuff, improved exp3p2 fig
fixed merge conflicts