CHG: Changes and bug fixes for high throughput