Bug fixes and re-collate