diff --git a/src/app/channel/media/queue.js b/src/app/channel/media/queue.js
index 6638f57..0887723 100644
--- a/src/app/channel/media/queue.js
+++ b/src/app/channel/media/queue.js
@@ -235,67 +235,76 @@ module.exports = class{
     }
 
     async goLive(socket, data){
-        //Grab the channel from DB
-        const chanDB = await channelModel.findOne({name:this.channel.name});
+        try{
+            //Grab the channel from DB
+            const chanDB = await channelModel.findOne({name:this.channel.name});
 
-        let title = "Livestream";
+            let title = "Livestream";
 
-        if(data != null && data.title != null){
-            //If the title is too long
-            if(!validator.isLength(data.title, {max:30})){
-                //Bitch, moan, complain...
-                loggerUtils.socketErrorHandler(socket, "Title too long!", "validation");
-                //and ignore it!
-                return;
+            if(data != null && data.title != null){
+                //If the title is too long
+                if(!validator.isLength(data.title, {max:30})){
+                    //Bitch, moan, complain...
+                    loggerUtils.socketErrorHandler(socket, "Title too long!", "validation");
+                    //and ignore it!
+                    return;
+                }
+
+                //Set title
+                title = validator.escape(validator.trim(data.title));
+
+                //If we've got no title
+                if(title == null || title == ''){
+                    title = "Livestream";
+                }
             }
 
-            //Set title
-            title = validator.escape(validator.trim(data.title));
-
-            //If we've got no title
-            if(title == null || title == ''){
-                title = "Livestream";
+            //If we couldn't find the channel
+            if(chanDB == null){
+                //FUCK
+                throw loggerUtils.exceptionSmith(`Unable to find channel document ${this.channel.name} while queue item!`, "queue");
             }
+
+            //Kill schedule timers to prevent items from starting during the stream
+            await this.stopScheduleTimers();
+
+            //Syntatic sugar because I'm lazy :P
+            const streamURL = chanDB.settings.streamURL;
+
+            if(streamURL == ''){
+                throw loggerUtils.exceptionSmith('This channel\'s HLS Livestream Source has not been set!', 'queue');
+            }
+
+
+            //Pull filename from streamURL
+            let filename = streamURL.match(/^.+\..+\/(.+)$/);
+
+            //If we're streaming from the root of the domain
+            if(filename == null){
+                //Set filename to root
+                filename = '/';
+            }else{
+                //Otherwise, hand over the filename
+                filename = filename[1];
+            }
+
+            //Create queued media object from stream URL and set it to nowPlaying
+            this.nowPlaying = new queuedMedia(
+                title,
+                filename,
+                streamURL,
+                streamURL,
+                "livehls",
+                0,
+                streamURL,
+                new Date().getTime()
+            );
+
+            //Broadcast new media object to users
+            this.sendMedia();
+        }catch(err){
+            return loggerUtils.socketExceptionHandler(socket, err);
         }
-
-        //If we couldn't find the channel
-        if(chanDB == null){
-            //FUCK
-            throw loggerUtils.exceptionSmith(`Unable to find channel document ${this.channel.name} while queue item!`, "queue");
-        }
-
-        //Kill schedule timers to prevent items from starting during the stream
-        await this.stopScheduleTimers();
-
-        //Syntatic sugar because I'm lazy :P
-        const streamURL = chanDB.settings.streamURL;
-
-        //Pull filename from streamURL
-        let filename = streamURL.match(/^.+\..+\/(.+)$/);
-
-        //If we're streaming from the root of the domain
-        if(filename == null){
-            //Set filename to root
-            filename = '/';
-        }else{
-            //Otherwise, hand over the filename
-            filename = filename[1];
-        }
-
-        //Create queued media object from stream URL and set it to nowPlaying
-        this.nowPlaying = new queuedMedia(
-            title,
-            filename,
-            streamURL,
-            streamURL,
-            "livehls",
-            0,
-            streamURL,
-            new Date().getTime()
-        );
-
-        //Broadcast new media object to users
-        this.sendMedia();
     }
 
     //--- INTERNAL USE ONLY QUEUEING FUNCTIONS ---
@@ -553,8 +562,11 @@ module.exports = class{
         //otherwise
         }else{
             try{
-                //DO everything ourselves since we don't have a fance end() function to do it
-                chanDB = await channelModel.findOne({name:this.channel.name});
+                //If we wheren't handed a channel
+                if(chanDB == null){
+                    //DO everything ourselves since we don't have a fance end() function to do it
+                    chanDB = await channelModel.findOne({name:this.channel.name});
+                }
 
                 //If we couldn't find the channel
                 if(chanDB == null){
@@ -814,6 +826,9 @@ module.exports = class{
         //Send play signal out to the channel
         this.sendMedia();
 
+        //Kill existing sync timers to prevent kicking-off ghost timer loops
+        clearTimeout(this.syncTimer);
+
         //Kick off the sync timer
         this.syncTimer = setTimeout(this.sync.bind(this), this.syncDelta);
 
@@ -879,9 +894,19 @@ module.exports = class{
                 this.server.io.in(this.channel.name).emit('end', {});
             }
 
+            //If we're ending an HLS Livestream
+            if(wasPlaying.type == "livehls"){
+                //Redirect to the endLivestream function
+                return this.endLivestream(chanDB);
+            }
+
+            //If we're not in volatile mode and we're not ending a livestream
             if(!volatile){
-                //Now that everything is clean, we can take our time with the DB :P
-                chanDB = await channelModel.findOne({name:this.channel.name});
+                //If we wheren't handed a channel
+                if(chanDB == null){
+                    //Now that everything is clean, we can take our time with the DB :P
+                    chanDB = await channelModel.findOne({name:this.channel.name});
+                }
 
                 //If we couldn't find the channel
                 if(chanDB == null){
@@ -898,12 +923,13 @@ module.exports = class{
                 //Take it out of the active schedule
                 this.schedule.delete(wasPlaying.startTime);
 
+                //If archiving is enabled
                 if(!noArchive){
                     //Add the item to the channel archive
                     chanDB.media.archived.push(wasPlaying);
                 }
 
-                //broadcast queue using unsaved archive
+                //broadcast queue using unsaved archive, run this before chanDB.save() for better responsiveness
                 this.broadcastQueue(chanDB);
 
                 //Save our changes to the DB
@@ -918,6 +944,22 @@ module.exports = class{
         }
     }
 
+    async endLivestream(chanDB){
+        try{
+            //Refresh next timer
+            this.refreshNextTimer();
+
+            //Broadcast Queue
+            this.broadcastQueue();
+        //ACK
+        }catch(err){
+            //Broadcast queue
+            this.broadcastQueue();
+            //Handle the error
+            loggerUtils.localExceptionHandler(err);
+        }
+    }
+
     async stop(chanDB){
         //If we wheren't handed a channel
         if(chanDB == null){
diff --git a/src/server.js b/src/server.js
index f6dcd98..f584830 100644
--- a/src/server.js
+++ b/src/server.js
@@ -160,8 +160,6 @@ app.use('/passwordReset', passwordResetRouter);
 app.use('/emailChange', emailChangeRouter);
 //Panel
 app.use('/panel', panelRouter);
-//Popup
-//app.use('/popup', popupRouter);
 //tooltip
 app.use('/tooltip', tooltipRouter);
 //Bot-Ready
@@ -169,9 +167,9 @@ app.use('/api', apiRouter);
 
 //Static File Server
 //Serve client-side libraries
-app.use('/lib/bootstrap-icons',express.static(path.join(__dirname, '../node_modules/bootstrap-icons')));
-app.use('/lib/altcha',express.static(path.join(__dirname, '../node_modules/altcha/dist_external')));
-app.use('/lib/hls.js',express.static(path.join(__dirname, '../node_modules/hls.js/dist')));
+app.use('/lib/bootstrap-icons',express.static(path.join(__dirname, '../node_modules/bootstrap-icons'))); //Icon set
+app.use('/lib/altcha',express.static(path.join(__dirname, '../node_modules/altcha/dist_external'))); //Self-Hosted PoW-based Captcha
+app.use('/lib/hls.js',express.static(path.join(__dirname, '../node_modules/hls.js/dist'))); //HLS Media Handler
 //Server public 'www' folder
 app.use(express.static(path.join(__dirname, '../www')));
 
diff --git a/src/views/channel.ejs b/src/views/channel.ejs
index d66fdc3..561702d 100644
--- a/src/views/channel.ejs
+++ b/src/views/channel.ejs
@@ -34,7 +34,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>. %>
         <%- include('partial/scripts', {user}); %>
         <%# 3rd party code %>
         <script src="/socket.io/socket.io.min.js"></script>
-        <script src="/lib/hls.js/hls.js"></script>
+        <script src="/lib/hls.js/hls.min.js"></script>
         <%# 1st party code %>
         <%# admin gunk %>
         <script src="/js/adminUtils.js"></script>
diff --git a/www/css/theme/movie-night.css b/www/css/theme/movie-night.css
index 1f28d4e..6df7a64 100644
--- a/www/css/theme/movie-night.css
+++ b/www/css/theme/movie-night.css
@@ -172,6 +172,11 @@ textarea{
     box-shadow: var(--danger-glow0-alt1);
 }
 
+.critical-danger-text{
+    color: var(--danger0-alt1);
+    text-shadow: var(--danger-glow0);
+}
+
 .danger-link, .danger-text{
     color: var(--danger0);
 }
diff --git a/www/js/channel/mediaHandler.js b/www/js/channel/mediaHandler.js
index 4f64926..aa272c5 100644
--- a/www/js/channel/mediaHandler.js
+++ b/www/js/channel/mediaHandler.js
@@ -141,6 +141,10 @@ class mediaHandler{
         //reset self act flag
         this.selfAct = false;
     }
+
+    onBuffer(){
+        this.selfAct = true;
+    }
 }
 
 //Basic building blocks for anything that touches a <video> tag
@@ -184,7 +188,7 @@ class rawFileBase extends mediaHandler{
         this.video.load();
 
         //Set it back to the proper time
-        this.video.currentTime = timestamp;
+        this.video.currentTime = this.lastTimestamp;
 
         //Play the video
         this.video.play();
@@ -234,18 +238,22 @@ class nullHandler extends rawFileBase{
     }
 
     start(){
+        //call derived start function
+        super.start();        
+
         //Lock the player
         this.setPlayerLock(true);
 
         //Set the static placeholder
         this.video.src = '/video/static.webm';
 
-        //Set video title manually
-        this.player.title.textContent = 'Channel Off Air'; 
-
         //play the placeholder video
         this.video.play();
     }
+
+    setVideoTitle(title){
+        this.player.title.textContent = `Channel Off Air`;
+    }
 }
 
 //Basic building blocks needed for proper time-synchronized raw-file playback
@@ -263,10 +271,14 @@ class rawFileHandler extends rawFileBase{
         super.defineListeners();
 
         this.video.addEventListener('pause', this.onPause.bind(this));
-        this.video.addEventListener('seeking', this.onSeek.bind(this));
+        this.video.addEventListener('seeked', this.onSeek.bind(this));
+        this.video.addEventListener('waiting', this.onBuffer.bind(this));
     }
 
     start(){
+        //Call derived start
+        super.start();
+
         //Set video
         this.video.src = this.nowPlaying.rawLink;
 
@@ -505,7 +517,7 @@ class hlsBase extends rawFileBase{
     }
 
     buildPlayer(){
-        //Call derived player
+        //Call derived buildPlayer function
         super.buildPlayer();
 
         //Instantiate HLS object
@@ -522,6 +534,14 @@ class hlsBase extends rawFileBase{
     }
 
     onMetadataLoad(){
+        //Call derived method
+        super.onMetadataLoad();
+    }
+
+    start(){
+        //Call derived method
+        super.start();
+
         //Start the video
         this.video.play();
     }
@@ -531,5 +551,74 @@ class hlsLiveStreamHandler extends hlsBase{
     constructor(client, player, media){
         //Call derived constructor
         super(client, player, media, "livehls");
+
+        //Create variable to determine if we need to resync after next seek
+        this.reSync = false;
+
+        this.video.addEventListener('pause', this.onPause.bind(this));
+        this.video.addEventListener('seeked', this.onSeek.bind(this));
+        this.video.addEventListener('waiting', this.onBuffer.bind(this));
+    }
+
+    sync(){
+        //Kick the video back on if it was paused
+        this.video.play();
+
+        //Pull video duration
+        const duration = this.video.duration;
+
+        //Ignore bad timestamps
+        if(duration > 0){
+            //Seek to the end to sync up w/ the livestream
+            this.video.currentTime = duration;
+        }
+    }
+
+    setVideoTitle(title){
+        //Add title as text content for security :P
+        this.player.title.textContent = `: ${title}`;
+
+        //Create glow span
+        const glowSpan = document.createElement('span');
+        //Fill glow span content
+        glowSpan.textContent = "🔴LIVE";
+        //Set glowspan class
+        glowSpan.classList.add('critical-danger-text');
+
+        //Inject glowspan into title in a way that allows it to be easily replaced
+        this.player.title.prepend(glowSpan);
+    }
+
+    onBuffer(event){
+        //Call derived function
+        super.onBuffer(event);
+
+
+        //If we're synced by the end of buffering
+        if(this.player.syncLock){
+            //Throw flag to manually sync since this works entirely differently from literally every other fucking media source
+            this.reSync = true;
+        }
+    }
+
+    onSeek(event){
+        //Call derived method
+        super.onSeek(event);
+
+        //Calculate distance to end of stream
+        const difference = this.video.duration - this.video.currentTime;
+
+
+        //If we where buffering under sync lock
+        if(this.reSync){
+            //Set reSync to false
+            this.reSync = false;
+
+            //If the difference is bigger than streamSyncTolerance
+            if(difference > this.player.streamSyncTolerance){
+                //Sync manually since we have no timestamp, and therefore the player won't do it for us
+                this.sync();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/www/js/channel/player.js b/www/js/channel/player.js
index 009013c..dac0a13 100644
--- a/www/js/channel/player.js
+++ b/www/js/channel/player.js
@@ -42,6 +42,8 @@ class player{
 
         //Numbers
         this.syncTolerance = 0.4;
+        //Might seem weird to keep this here instead of the HLS handler, but remember we may want to support other livestream services in the future...
+        this.streamSyncTolerance = 2;
         this.syncDelta = 6;
         this.volume = 1;