fixed more production settings
Merge branch 'develop'