lots of deployment fixes