Commit to current development.

Various bug fixes and enhancements.