adding tweaks from production launch