clean up some feature stuff, fix flapping integration test.