batch master improvements