some changes to help with deployment
new code
some improvements