Some changes to settings, deploy script
Fixes