Improove audio, still some improovement todo