Music chtype corrections, misc tweaks...