Fix grouping with grace
Add support for D.C. al Coda