Tag production readiness

Preparing code for production deployment