Enhancements.

* #745
* #719
* #530