Bug fixes and moderate performance improvement.