added shapeit and fixed impute2 a little