final tweaks, ready to deploy