changed some sound stuff
fixed merge yayyy