music volume

and some additional fixes and renames