lots of tweaks for final production mode