Various improvements from arche-music-training