final tweaks in prod