tuned music volume, added SFX
fixed merge