Pulling in latest changes

Fixed sound issues.