more sound scripts, fixed merge bugs