restoring old pivot behavior to make this release less of a breaking change
a few bugfixes