Incremental improvements

* The stuff I would say in an e-mail anyways.