music, some tweaks and fixes