Minor Update

This update introduces some additional bug fixes, and code quality
improvements.