preparing for deployment
Some settings and deploy fixes