Paper version v2

The version reproduces the paper results and should be used to that effect.

Paper version

This version should effectively be the version used for all the results run in the paper (with the code cleaned up a bit).