diff --git a/src/gemini/gemini-parser.lisp b/src/gemini/gemini-parser.lisp
index bab3e72..a064d12 100644
--- a/src/gemini/gemini-parser.lisp
+++ b/src/gemini/gemini-parser.lisp
@@ -395,11 +395,11 @@
     :initform nil
     :accessor viewport)))
 
-(defclass with-raw-text ()
-  ((raw-text
+(defclass with-source-line ()
+  ((source-line
     :initform nil
-    :initarg  :raw-text
-    :accessor raw-text)
+    :initarg  :source-line
+    :accessor source-line)
    (source-line-id
     :initform nil
     :initarg  :source-line-id
@@ -410,8 +410,8 @@
     :reader   artificialp
     :writer   (setf artificial))))
 
-(defmethod print-object ((object with-raw-text) stream)
-  (format stream "sid: ~a raw-text: ~a" (source-line-id object) (raw-text object)))
+(defmethod print-object ((object with-source-line) stream)
+  (format stream "sid: ~a source-line: ~a" (source-line-id object) (source-line object)))
 
 (defclass with-group-id ()
   ((group-id
@@ -437,7 +437,7 @@
     :initarg  :pre-group-id
     :accessor pre-group-id)))
 
-(defclass pre-start (with-group-id with-pre-group-id with-alt-text with-raw-text) ())
+(defclass pre-start (with-group-id with-pre-group-id with-alt-text with-source-line) ())
 
 (defmethod print-object ((object pre-start) stream)
   (print-unreadable-object (object stream :type t :identity t)
@@ -449,12 +449,12 @@
                  :group-id     group-id
                  :pre-group-id pre-group-id))
 
-(defclass pre-end (with-raw-text) ())
+(defclass pre-end (with-source-line) ())
 
 (defun make-pre-end ()
   (make-instance 'pre-end))
 
-(defclass quoted-lines (with-group-id with-lines with-raw-text)
+(defclass quoted-lines (with-group-id with-lines with-source-line)
   ((prefix
     :initform "@ "
     :initarg  :prefix
@@ -466,7 +466,7 @@
                  :group-id group-id
                  :lines    (list text)))
 
-(defclass pre-line (with-group-id with-pre-group-id with-lines with-alt-text with-raw-text) ())
+(defclass pre-line (with-group-id with-pre-group-id with-lines with-alt-text with-source-line) ())
 
 (defmethod print-object ((object pre-line) stream)
   (print-unreadable-object (object stream :type t)
@@ -483,13 +483,13 @@
                  :pre-group-id pre-group-id
                  :alt-text     alt-text))
 
-(defclass vertical-space (with-group-id with-raw-text)
+(defclass vertical-space (with-group-id with-source-line)
   ((size
     :initform 1
     :initarg  :size
     :accessor size)))
 
-(defclass header-line (with-group-id with-lines with-raw-text)
+(defclass header-line (with-group-id with-lines with-source-line)
   ((level
     :initform nil
     :initarg :level
@@ -502,14 +502,14 @@
                  :level      level
                  :artificial artificial))
 
-(defclass unordered-list-line (with-group-id with-lines with-raw-text) ())
+(defclass unordered-list-line (with-group-id with-lines with-source-line) ())
 
 (defun make-unordered-list-line (text header-group-id)
   (make-instance 'unordered-list-line
                  :group-id header-group-id
                  :lines    (list text)))
 
-(defclass link-line (with-group-id with-raw-text)
+(defclass link-line (with-group-id with-source-line)
   ((link-text
     :initarg  :link-text
     :initform nil
@@ -530,7 +530,7 @@
                  :link-name  link-name
                  :link-value link-value))
 
-(defclass simple-line (with-group-id with-raw-text)
+(defclass simple-line (with-group-id with-source-line)
   ((text-line
     :initarg :text-line
     :initform nil
@@ -594,12 +594,12 @@
                ((typep thing 'list)
                 (mapcar (lambda (a)
                           (setf (source-line-id a) source-line-id)
-                          (setf (raw-text       a) source-line)
+                          (setf (source-line    a) source-line)
                           a)
                         thing))
                (t
                 (setf (source-line-id thing) source-line-id)
-                (setf (raw-text       thing) source-line)
+                (setf (source-line    thing) source-line)
                 thing)))
            (build-row (node)
              (let ((source-line    (extract-source-line node))
diff --git a/src/gemini/package.lisp b/src/gemini/package.lisp
index 8166500..8c80e19 100644
--- a/src/gemini/package.lisp
+++ b/src/gemini/package.lisp
@@ -71,7 +71,7 @@
    :h3-prefix
    :quote-prefix
    :bullet-prefix
-   :raw-text
+   :source-line
    :source-line-id
    :artificialp
    :artificial
diff --git a/src/message-window.lisp b/src/message-window.lisp
index d5fce61..732325d 100644
--- a/src/message-window.lisp
+++ b/src/message-window.lisp
@@ -694,12 +694,14 @@
 
 (defun original-source-metadata (row)
   (let* ((original-line   (row-get-original-object      row))
-         (source-line     (gemini-parser:raw-text       original-line))
+         (source-line     (gemini-parser:source-line    original-line))
          (source-line-id  (gemini-parser:source-line-id original-line))
          (artificialp     (gemini-parser:artificialp    original-line)))
     (values source-line-id source-line artificialp)))
 
 (defun search-gemini-fragment (window fragment)
+  "Search `fragment' in the source lines  of the gemini steams and -if
+fragment matches- move the window to the line when matching occurred."
   (labels ((prefix-diff (text-rows source-line)
              (- (length (first (split-words (first text-rows))))
                 (length (first (split-words source-line)))))