New experiments structure, bug fixes