choristers changes and bug fixes