lots of deploy related updates