Fix some bugs
Store the experiment first in case we want to debug