diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index 90da263d58..efcb9942bc 100644
--- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -85,3 +85,6 @@ DataContentViewerString.goToPageLabel.text=Go to Page:
 DataContentViewerString.goToPageTextField.text=
 DataContentViewerHex.goToPageTextField.text=
 DataContentViewerHex.goToPageLabel.text=Go to Page: 
+DataContentViewerString.languageLabel.toolTipText=
+DataContentViewerString.languageLabel.text=Script:
+DataContentViewerString.languageCombo.toolTipText=Script / language to attempt when interpreting (extracting and decoding) strings from binary data
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
index 2c18dfb80f..d05c9e09d7 100644
--- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
+++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
@@ -79,7 +79,7 @@
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="languageCombo" min="-2" pref="96" max="-2" attributes="0"/>
               </Group>
-              <Component id="jScrollPane1" pref="622" max="32767" attributes="0"/>
+              <Component id="jScrollPane1" pref="756" max="32767" attributes="0"/>
           </Group>
         </DimensionLayout>
         <DimensionLayout dim="1">
@@ -277,6 +277,9 @@
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="DataContentViewerString.languageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
+            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="DataContentViewerString.languageLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
           </Properties>
         </Component>
       </SubComponents>
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
index cc0f3fbfe1..227e1e22fa 100644
--- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
+++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
@@ -189,6 +189,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
         });
 
         languageLabel.setText(org.openide.util.NbBundle.getMessage(DataContentViewerString.class, "DataContentViewerString.languageLabel.text")); // NOI18N
+        languageLabel.setToolTipText(org.openide.util.NbBundle.getMessage(DataContentViewerString.class, "DataContentViewerString.languageLabel.toolTipText")); // NOI18N
 
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
@@ -217,7 +218,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
                 .addComponent(languageLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(languageCombo, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE))
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 622, Short.MAX_VALUE)
+            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 756, Short.MAX_VALUE)
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java
index 4921e1c972..13a81a2bb1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringIntStream.java
@@ -105,10 +105,6 @@ public class AbstractFileStringIntStream extends InputStream {
             if ((convertBuff == null || convertBuffRemain == 0) && !fileEOF && fileReadOffset < fileSize) {
                 try {
                     //convert more strings, store in buffer
-                    //we know this implementation will read what we asked for, unless end of stream
-                    //TODO to be safe, we should read repeatadly to ensure we have max possible fileReadBuff
-                    //as we don't want to depend on stream implementation and end up with inefficient/broken string extraction
-
                     long toRead = 0;
                     int shiftSize = 0;
                     if (lastExtractResult != null && lastExtractResult.getTextLength() != 0