Experiments mk2

This release fixes a number of bugs which became apparent after running the first batch of experiments. Hopefully this is the version which makes it into the thesis