Fix up a few more things for robustness
experiments
Refining experiments and removing invalid combinations.