diff --git a/av-only-h263-3gp.m3u8 b/av-only-h263-3gp.m3u8
index bb8d7e8..12f7aa8 100644
--- a/av-only-h263-3gp.m3u8
+++ b/av-only-h263-3gp.m3u8
@@ -2,5 +2,5 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="a1",NAME="English",LANGUAGE="en-US",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="2",URI="audio-mp3.m3u8"
 
-#EXT-X-STREAM-INF:BANDWIDTH=4785000,RESOLUTION=352x288,FRAME-RATE=29.970,CODECS="s263"
+#EXT-X-STREAM-INF:BANDWIDTH=4785000,RESOLUTION=352x288,FRAME-RATE=29.970,CODECS="h263"
 h263-in-3gp.m3u8
diff --git a/av-only-h263-mov.m3u8 b/av-only-h263-mov.m3u8
index 7fba238..69c4bc3 100644
--- a/av-only-h263-mov.m3u8
+++ b/av-only-h263-mov.m3u8
@@ -2,5 +2,5 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="a1",NAME="English",LANGUAGE="en-US",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="2",URI="audio-mp3.m3u8"
 
-#EXT-X-STREAM-INF:BANDWIDTH=4785000,RESOLUTION=352x288,FRAME-RATE=29.970,CODECS="s263"
+#EXT-X-STREAM-INF:BANDWIDTH=4785000,RESOLUTION=352x288,FRAME-RATE=29.970,CODECS="h263"
 h263-in-mov.m3u8
diff --git a/av-only-h263-mp4.m3u8 b/av-only-h263-mp4.m3u8
index fbd0b66..e264178 100644
--- a/av-only-h263-mp4.m3u8
+++ b/av-only-h263-mp4.m3u8
@@ -2,5 +2,5 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="a1",NAME="English",LANGUAGE="en-US",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="2",URI="audio-mp3.m3u8"
 
-#EXT-X-STREAM-INF:BANDWIDTH=4785000,RESOLUTION=352x288,FRAME-RATE=29.970,CODECS="s263"
+#EXT-X-STREAM-INF:BANDWIDTH=4785000,RESOLUTION=352x288,FRAME-RATE=29.970,CODECS="h263"
 h263-in-mp4.m3u8
diff --git a/flat.html b/flat.html
index 168e5c1..c9012f3 100644
--- a/flat.html
+++ b/flat.html
@@ -19,6 +19,10 @@
             <source type="video/mp4; codecs=&quot;avc1.640032, mp4a.40&quot;" src=polyphon-h264-aac.mp4>
         </video>
 
+        <p>This one will be VP9/MP3 in MP4 listed as mp4a.6b:</p>
+        <video id=flat2a controls width=640 height=360>
+            <source type="video/mp4; codecs=&quot;vp09.00.10.08, mp4a.6b&quot;" src=polyphon-vp9-mp3.mp4>
+        </video>
 
         <p>This one will be h264 only:</p>
         <video id=flat3 controls width=640 height=360>
diff --git a/mp3.html b/mp3.html
index ddb11f8..26514dd 100644
--- a/mp3.html
+++ b/mp3.html
@@ -6,11 +6,36 @@
     </head>
     <body>
         <h1>HLS WebM test with codec</h1>
-        <p>The video will try to load an HLS containing VP9-in-MP4 and fallback variants, with Opus audio:</p>
+        <p>The video will try to load an HLS containing VP9-in-MP4 and fallback variants, with MP3 audio:</p>
         <video id=hls1 controls width=640 height=360>
             <source type=application/vnd.apple.mpegurl src=av-mp3-mp4.m3u8>
         </video>
-        <p id=err></p>
+        <p id=err1></p>
+
+        <p>And with MP3 audio and only H.264 (marked as mp4a.6b):</p>
+        <video id=hls2 controls width=640 height=360>
+            <source type=application/vnd.apple.mpegurl src=av-mp3-h264.m3u8>
+        </video>
+        <p id=err2></p>
+
+        <p>And with MP3-in-MP4 audio (marked as mp3):</p>
+        <video id=hls3 controls width=640 height=360>
+            <source type=application/vnd.apple.mpegurl src=av-mp3mp4-h264.m3u8>
+        </video>
+        <p id=err3></p>
+
+        <p>And with MP3-in-MP4 audio (marked as mp4a.6b):</p>
+        <video id=hls4 controls width=640 height=360>
+            <source type=application/vnd.apple.mpegurl src=av-mp3mp4b-h264.m3u8>
+        </video>
+        <p id=err4></p>
+
+        <p>And with MP3-in-TS audio:</p>
+        <video id=hls5 controls width=640 height=360>
+            <source type=application/vnd.apple.mpegurl src=av-ts-h264.m3u8>
+        </video>
+        <p id=err5></p>
+
         <script>
             let codes = {
                 [MediaError.MEDIA_ERR_ABORTED]: 'MEDIA_ERR_ABORTED',
@@ -18,11 +43,18 @@
                 [MediaError.MEDIA_ERR_DECODE]: 'MEDIA_ERR_DECODE',
                 [MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED]: 'MEDIA_ERR_SRC_NOT_SUPPORTED',
             };
-            hls1.addEventListener('error', function() {
-                let {code, message} = this.error;
-                let codeName = codes[code];
-                err.textContent = `${code} ${codeName}: ${message}`;
-            });
+            function errify(hls, err) {
+                hls.addEventListener('error', function() {
+                    let {code, message} = this.error;
+                    let codeName = codes[code];
+                    err.textContent = `${code} ${codeName}: ${message}`;
+                });
+            }
+            errify(hls1, err1);
+            errify(hls2, err2);
+            errify(hls3, err3);
+            errify(hls4, err4);
+            errify(hls5, err5);
         </script>
 
     </body>
diff --git a/opus.html b/opus.html
index 3d93d1f..ac9582b 100644
--- a/opus.html
+++ b/opus.html
@@ -6,11 +6,25 @@
     </head>
     <body>
         <h1>HLS WebM test with codec</h1>
-        <p>The video will try to load an HLS containing VP9-in-MP4 and fallback variants, with Opus audio:</p>
+
+        <p>The video will try to load an HLS containing VP9-in-MP4 and fallback variants, with Opus audio marked as mp4a.ad:</p>
         <video id=hls1 controls width=640 height=360>
             <source type=application/vnd.apple.mpegurl src=av-opus-mp4.m3u8>
         </video>
         <p id=err></p>
+
+        <p>The video will try to load an HLS containing VP9-in-MP4 and fallback variants, with Opus audio marked as opus:</p>
+        <video id=hls2 controls width=640 height=360>
+            <source type=application/vnd.apple.mpegurl src=av-opusb-mp4.m3u8>
+        </video>
+        <p id=err2></p>
+
+        <p>The video will try to load an HLS containing VP9-in-MP4 and fallback variants, with Opus audio marked as Opus:</p>
+        <video id=hls3 controls width=640 height=360>
+            <source type=application/vnd.apple.mpegurl src=av-opusc-mp4.m3u8>
+        </video>
+        <p id=err3></p>
+
         <script>
             let codes = {
                 [MediaError.MEDIA_ERR_ABORTED]: 'MEDIA_ERR_ABORTED',
@@ -18,11 +32,16 @@
                 [MediaError.MEDIA_ERR_DECODE]: 'MEDIA_ERR_DECODE',
                 [MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED]: 'MEDIA_ERR_SRC_NOT_SUPPORTED',
             };
-            hls1.addEventListener('error', function() {
-                let {code, message} = this.error;
-                let codeName = codes[code];
-                err.textContent = `${code} ${codeName}: ${message}`;
-            });
+            function errify(hls, err) {
+                hls.addEventListener('error', function() {
+                    let {code, message} = this.error;
+                    let codeName = codes[code];
+                    err.textContent = `${code} ${codeName}: ${message}`;
+                });
+            }
+            errify(hls1, err1);
+            errify(hls2, err2);
+            errify(hls3, err3);
         </script>
 
     </body>
diff --git a/sync-up.sh b/sync-up.sh
old mode 100644
new mode 100755
