Changes rollup

This collects the changes that seem to be worthwhile from Dealer.com's fork, because I waited too long to make a PR!