fix weighted overlap and improvements