Updated deploy script
And more