a lot of fixes and music tests