Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 129)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 132)
@@ -162,8 +162,19 @@
          */
         // Set listener for scroll pane
+        String t = "Script Builder: ";
+        if (script.saveFile == null)
+        {
+            t += "untitled1.xml";
+        }
+        else
+        {
+            t += script.saveFile.getName();
+        }
+        this.setTitle(t);
         AdjustmentListener listener = new MyAdjustmentListener();
         timelinesScrollPane.getHorizontalScrollBar().addAdjustmentListener(listener);
         timelinesScrollPane.getVerticalScrollBar().addAdjustmentListener(listener);
         repaint();
+
     }
 
@@ -260,4 +271,14 @@
                 / Math.max(script.absoluteLength(), ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH));
         zoomSlider.setMaximum(zoomSlider.getMinimum() + 20);
+        String t = "Script Builder: ";
+        if (script.saveFile == null)
+        {
+            t += "untitled1.xml";
+        }
+        else
+        {
+            t += script.saveFile.getName();
+        }
+        this.setTitle(t);
         repaint();
     }
@@ -1700,5 +1721,18 @@
     private void fileSaveAsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveAsActionPerformed
         JFileChooser fc = new JFileChooser();
-
+        boolean wasNull = false;
+        if (script.saveFile == null)
+        {
+            wasNull = true;
+            String fName = "untitled";
+            int untitledCount = 1;
+            while (new File("" + fName + untitledCount + ".xml").exists())
+            {
+                untitledCount++;
+            }
+            script.saveFile = new File("" + fName + untitledCount + ".xml");
+        }
+
+        fc.setSelectedFile(script.saveFile);
         fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)",
                 new String[]
@@ -1709,7 +1743,21 @@
         if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION)
         {
-            script.saveScriptToFile(fc.getSelectedFile());
-            script.saveFile = fc.getSelectedFile();
-        }
+            String filename = fc.getSelectedFile().toString();
+            if (!filename.endsWith(".xml"))
+            {
+                filename += ".xml";
+
+            }
+            script.saveScriptToFile(new File(filename));
+            script.saveFile = new File(filename);
+        }
+        else
+        {
+            if (wasNull)
+            {
+                script.saveFile = null;
+            }
+        }
+        this.update(script, 0);
     }//GEN-LAST:event_fileSaveAsActionPerformed
 
@@ -1885,6 +1933,8 @@
         }
 
+        String fs = System.getProperty("file.separator");
         //Pick the file to save it to
         JFileChooser fc = new JFileChooser();
+        fc.setSelectedFile(new File("" + System.getProperty("user.dir") + fs + "Incidents" + fs + "inc_" + inc.number + ".xml"));
         fc.setFileFilter(new ExtensionFileFilter("Script Incident (.xml)", new String[]
         {
@@ -1893,5 +1943,11 @@
         if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION)
         {
-            inc.saveIncidentToFile(fc.getSelectedFile());
+            String filename = fc.getSelectedFile().toString();
+            if (!filename.endsWith(".xml"))
+            {
+                filename += ".xml";
+
+            }
+            inc.saveIncidentToFile(new File(filename));
         }
     }//GEN-LAST:event_saveIncidentActionPerformed