General mixup of 0.9.2b1

There are various small changes that I'm working on with @ssim for the release of 0.9.2