small fixes + preparation for experiments.