Update with bug fixes and enhancements.