more experiments and improvements