diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form
index 97c4f661..d92083ed 100644
--- a/plugins/PhotonEnergy.form
+++ b/plugins/PhotonEnergy.form
@@ -238,7 +238,7 @@
         <Component class="javax.swing.JSpinner" name="spinnerStart">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="100.0" maximum="1000.0" minimum="0.0" numberType="java.lang.Double" stepSize="50.0" type="number"/>
+              <SpinnerModel initial="100.0" maximum="2000.0" minimum="0.0" numberType="java.lang.Double" stepSize="50.0" type="number"/>
             </Property>
           </Properties>
           <Events>
@@ -253,7 +253,7 @@
         <Component class="javax.swing.JSpinner" name="spinnerEnd">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="200.0" maximum="1000.0" minimum="0.0" numberType="java.lang.Double" stepSize="50.0" type="number"/>
+              <SpinnerModel initial="200.0" maximum="2000.0" minimum="0.0" numberType="java.lang.Double" stepSize="50.0" type="number"/>
             </Property>
           </Properties>
           <Events>
@@ -263,7 +263,7 @@
         <Component class="javax.swing.JSpinner" name="spinnerStep">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="50.0" maximum="1000.0" minimum="1.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
+              <SpinnerModel initial="50.0" maximum="1000.0" minimum="0.001" numberType="java.lang.Double" stepSize="10.0" type="number"/>
             </Property>
           </Properties>
           <Events>
@@ -302,7 +302,7 @@
         <Component class="javax.swing.JSpinner" name="spinnerCenter">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="50.0" maximum="1000.0" minimum="0.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
+              <SpinnerModel initial="50.0" maximum="2000.0" minimum="0.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
             </Property>
           </Properties>
           <Events>
@@ -312,7 +312,7 @@
         <Component class="javax.swing.JSpinner" name="spinnerLow">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="50.0" maximum="1000.0" minimum="0.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
+              <SpinnerModel initial="50.0" maximum="2000.0" minimum="0.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
             </Property>
           </Properties>
           <Events>
@@ -332,7 +332,7 @@
         <Component class="javax.swing.JSpinner" name="spinnerHigh">
           <Properties>
             <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-              <SpinnerModel initial="100.0" maximum="1000.0" minimum="0.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
+              <SpinnerModel initial="100.0" maximum="2000.0" minimum="0.0" numberType="java.lang.Double" stepSize="10.0" type="number"/>
             </Property>
           </Properties>
           <Events>
diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java
index 0d8c88cc..416a466b 100644
--- a/plugins/PhotonEnergy.java
+++ b/plugins/PhotonEnergy.java
@@ -259,7 +259,7 @@ public class PhotonEnergy extends Panel {
 
         jLabel4.setText("Eph Start");
 
-        spinnerStart.setModel(new javax.swing.SpinnerNumberModel(100.0d, 0.0d, 1000.0d, 50.0d));
+        spinnerStart.setModel(new javax.swing.SpinnerNumberModel(100.0d, 0.0d, 2000.0d, 50.0d));
         spinnerStart.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 spinnerEnergyChanged(evt);
@@ -268,14 +268,14 @@ public class PhotonEnergy extends Panel {
 
         jLabel5.setText("Eph End");
 
-        spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(200.0d, 0.0d, 1000.0d, 50.0d));
+        spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(200.0d, 0.0d, 2000.0d, 50.0d));
         spinnerEnd.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 spinnerEnergyChanged(evt);
             }
         });
 
-        spinnerStep.setModel(new javax.swing.SpinnerNumberModel(50.0d, 1.0d, 1000.0d, 10.0d));
+        spinnerStep.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.001d, 1000.0d, 10.0d));
         spinnerStep.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 spinnerEnergyChanged(evt);
@@ -297,14 +297,14 @@ public class PhotonEnergy extends Panel {
 
         jLabel7.setText("E center:");
 
-        spinnerCenter.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 1000.0d, 10.0d));
+        spinnerCenter.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 2000.0d, 10.0d));
         spinnerCenter.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 spinnerEnergyChanged(evt);
             }
         });
 
-        spinnerLow.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 1000.0d, 10.0d));
+        spinnerLow.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 2000.0d, 10.0d));
         spinnerLow.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 spinnerEnergyChanged(evt);
@@ -315,7 +315,7 @@ public class PhotonEnergy extends Panel {
 
         jLabel9.setText("E high:");
 
-        spinnerHigh.setModel(new javax.swing.SpinnerNumberModel(100.0d, 0.0d, 1000.0d, 10.0d));
+        spinnerHigh.setModel(new javax.swing.SpinnerNumberModel(100.0d, 0.0d, 2000.0d, 10.0d));
         spinnerHigh.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 spinnerEnergyChanged(evt);
diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form
index 196bb91a..03d5f2e0 100644
--- a/plugins/XPSSpectrum.form
+++ b/plugins/XPSSpectrum.form
@@ -177,6 +177,7 @@
                 <StringItem index="6" value="200"/>
               </StringArray>
             </Property>
+            <Property name="selectedIndex" type="int" value="4"/>
             <Property name="toolTipText" type="java.lang.String" value=""/>
           </Properties>
         </Component>
@@ -198,7 +199,7 @@
         <Component class="ch.psi.pshell.swing.ValueSelection" name="valueLow">
           <Properties>
             <Property name="decimals" type="int" value="2"/>
-            <Property name="maxValue" type="double" value="1000.0"/>
+            <Property name="maxValue" type="double" value="2000.0"/>
             <Property name="minValue" type="double" value="0.0"/>
             <Property name="showButtons" type="boolean" value="false"/>
             <Property name="value" type="double" value="0.0"/>
@@ -213,7 +214,7 @@
         <Component class="ch.psi.pshell.swing.ValueSelection" name="valueHigh">
           <Properties>
             <Property name="decimals" type="int" value="2"/>
-            <Property name="maxValue" type="double" value="1000.0"/>
+            <Property name="maxValue" type="double" value="2000.0"/>
             <Property name="minValue" type="double" value="0.0"/>
             <Property name="showButtons" type="boolean" value="false"/>
             <Property name="value" type="double" value="100.0"/>
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java
index 1fe6aaa2..944a807a 100644
--- a/plugins/XPSSpectrum.java
+++ b/plugins/XPSSpectrum.java
@@ -257,6 +257,7 @@ public class XPSSpectrum extends Panel {
         valueTime.setValue(1.0);
 
         comboPass.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "2", "5", "10", "20", "50", "100", "200" }));
+        comboPass.setSelectedIndex(4);
         comboPass.setToolTipText("");
 
         valueSize.setDecimals(2);
@@ -269,7 +270,7 @@ public class XPSSpectrum extends Panel {
         jLabel11.setText("Pass:");
 
         valueLow.setDecimals(2);
-        valueLow.setMaxValue(1000.0);
+        valueLow.setMaxValue(2000.0);
         valueLow.setMinValue(0.0);
         valueLow.setShowButtons(false);
         valueLow.setValue(0.0);
@@ -278,7 +279,7 @@ public class XPSSpectrum extends Panel {
         jLabel2.setText("High:");
 
         valueHigh.setDecimals(2);
-        valueHigh.setMaxValue(1000.0);
+        valueHigh.setMaxValue(2000.0);
         valueHigh.setMinValue(0.0);
         valueHigh.setShowButtons(false);
         valueHigh.setValue(100.0);