minor tweaks from qa feedback