Improve deployment functions
Tweak messages