audio refactor
modal fix