ticket:5 fixes all for deploying
ticket:5 fixes all for deploying