Some tweaks. no logical change