Experiment 3 B1.1 many fixes and improvements