tweaks from PR