deployment bugs fixed
merge deployment bugs fixed