fix #23366 plus partial fix for #23622

hopefully the last for #23366 ...

I'm not too familiar with those musical terms, so please double check.

Also partial fix #23622, adding some missing units