General commit, nothing major, changes in experimental setting