fixed deployment issues and error msgs