tweaks from master