diff --git a/NoteExtender/NoteExtender.xml b/NoteExtender/NoteExtender.xml
index 6c70bdf..97c4c68 100644
--- a/NoteExtender/NoteExtender.xml
+++ b/NoteExtender/NoteExtender.xml
@@ -3,59 +3,27 @@
 <!-- Saved on Wednesday, March 09, 2022, 11:04 AM -->
 <!-- MuClient version 5.07-pre -->
 
-<!-- Plugin "RoomCharWindow" generated by Plugin Wizard -->
-
 <muclient>
-<plugin
-   name="NoteWindow"
-   author="Crowley"
-   id="c49e43d9dce931263263088b"
-   language="Lua"
-   purpose="Note output and hyperlinks"
-   save_state="y"
-   date_written="2022-03-09 11:02:09"
-   requires="5.07"
-   version="1.0"
-   sequence="10"
-   >
-
-</plugin>
-<!-- Aliases -->
-
-<aliases>
-  <alias
-   match="^(note(?: read(?: \d+| last| again)?)?)$"
-   enabled="y"
-   regexp="y"
-   script="startNoteRead"
-   sequence="100"
-  >
-  </alias>
-
-  <alias
-   match="^notewin (on|off|show|hide|clear|help)$"
-   enabled="y"
-   regexp="y"
-   ignore_case="y"
-   script="toggleNoteWin"
-   sequence="100"
-   >
-   </alias>
-
-<alias
-   match="^(note\s?(?:list(?:\s\d+)?|unread|to\s\w+|from\s\w+|subj\s.+)?)$"
-   enabled="y"
-   regexp="y"
-   script="startNoteList"
-   sequence="100"
-  >
-  </alias>
-</aliases>
-
-<script>
-<![CDATA[
-local extras = require "aard_lua_extras"
+   <plugin name="NoteExtender" author="Crowley" id="c49e43d9dce931263263088b" language="Lua" purpose="Note output and hyperlinks" save_state="y" date_written="2022-03-09 11:02:09" requires="5.07" version="1.0" sequence="10">
+
+   </plugin>
+   <!-- Aliases -->
+
+   <aliases>
+      <alias match="^(note(?: read(?: \d+| last| again)?)?)$" enabled="y" regexp="y" script="startNoteRead" sequence="100">
+      </alias>
+
+      <alias match="^notewin (on|off|show|hide|clear|help)$" enabled="y" regexp="y" ignore_case="y" script="toggleNoteWin" sequence="100">
+      </alias>
+
+      <alias match="^(note\s?(?:list(?:\s\d+)?|unread|to\s\w+|from\s\w+|subj\s.+)?)$" enabled="y" regexp="y" script="startNoteList" sequence="100">
+      </alias>
+   </aliases>
+
+   <script>
+      <![CDATA[
 require "gmcphelper"
+local extras = require "aard_lua_extras"
 local snapshotV = tonumber(extras.PackageVersion())
 
 local prefix = GetAlphaOption("script_prefix")
@@ -118,7 +86,25 @@ function startNoteList(name, line, wildcards)
    Capture.untagged_output(param, true, true, true, hyperlinknotes, false)
 end
 
+function findBoundaries(tbl)
+   local startIdx = 1
+   local endIdx = #tbl
+
+   while startIdx<= endIdx and not tbl[startIdx][1].text:find("~") and not tbl[strtIdx][1].text:find("No more new") do
+      table.remove(tbl, startIdx)
+      startIdx = startIdx + 1
+   end
+
+   while endIdx >= 1 and not tbl[endIdx][1].text:find("~") and not tbl[endIdx][1].text:find("There are no") and not tbl[endIdx][1].text:find("Changed to") do
+      table.remove(tbl, endIdx)
+      endIdx = endIdx -1
+   end
+
+   return tbl
+end
+
 function addToWindow(lines)
+   local lines = findBoundaries(lines)
    NotesWin:clear(false)
    NotesWin:add_text(lines, false)
 
@@ -128,36 +114,8 @@ function addToWindow(lines)
 end
 
 
-function findBoundaries(lines)
-   local first_index = nil
-   local last_index = nil
-
--- Find the first and last indices with ~ in the text field
-   for i, v in ipairs(lines) do
-       if (string.find(v[1].text, "~") or string.find(v[1].text, "No more new posts")) and not first_index then
-           first_index = i
-      end
-      if (string.find(v[1].text, "~") or string.find(v[1].text, "There are no new")) then
-           last_index = i
-      end
-   end
-
--- Remove all the entries before the first ~ and after the last ~
-   if first_index and last_index then
-       for i = #lines, last_index + 1, -1 do
-           table.remove(lines, i)
-      end
-      for i = first_index - 1, 1, -1 do
-           table.remove(lines, i)
-      end
-   end
-
-   return lines
-end
-
-
 function hyperlinknotes(lines)
-   for i,v in ipairs(findBoundaries(lines)) do
+   for i,v in ipairs(lines) do
       if i < 5 or i == #lines then
          Simulate(stylesToANSI(v) .. "\n")
       else
@@ -174,29 +132,36 @@ function hyperlinknotes(lines)
 end
 
 function toggleNoteWin(name, line, wildcards)
-   if wildcards[1] == "on" or wildcards[1] == "show" then
+   local noteOpt = wildcards[1]
+
+   if noteOpt == "on" then
       noteShow = "true"
       SetVariable("noteShow", noteShow)
-      ColourNote("white", "blue", "Toggled Note Window Status: " .. wildcards[1])
-   elseif wildcards[1] == "off" or wildcards[1] == "hide" then
+      ColourNote("white", "blue", "Note Extender: Displaying notes in window.")
+   elseif noteOpt == "off" then
       noteShow = "false"
       SetVariable("noteShow", noteShow)
-      ColourNote("white", "blue", "Toggled Note Window Status: " .. wildcards[1])
-   elseif wildcards[1] == "clear" then
+      ColourNote("white", "blue", "Note Extender: Displaying notes in main output.")
+   elseif noteOpt == "show" then
+      NotesWin:fit_contents(850, 500)
+      NotesWin:show()
+   elseif noteOpt == "hide" then
+      NotesWin:hide()
+   elseif noteOpt == "clear" then
       NotesWin:clear(false)
       NotesWin:hide()
-      ColourNote("white", "blue", "Clearing Note Window...")
-   elseif wildcards[1] == "help" then
+   elseif noteOpt == "help" then
       onHelp()
    end
 end
 
 function onHelp()
    ColourNote("yellow", "", "Basic commands:")
-   ColourNote("orange", "", string.format("%-30s - %s", "notewin <on|show|off|hide>", "Toggles the display of the note window."))
+   ColourNote("orange", "", string.format("%-30s - %s", "notewin <on|off>", "Toggles where notes are displayed (window or output)."))
+   ColourNote("orange", "", string.format("%s-30s - %s", "notewin <show|hide>", "Shows or hides the note window."))
    ColourNote("orange", "", string.format("%-30s - %s", "notewin clear", "Clears the note window of existing content."))
 end
 
 ]]>
-</script>
+   </script>
 </muclient>