a bunch of integration updates