diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 08de716..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CVS/
-CVS
-/deployed/
-/build/
-/cmd.bat
\ No newline at end of file
diff --git a/GooglME-1.ipr b/GooglME-1.ipr
index 5457326..97d8b08 100755
--- a/GooglME-1.ipr
+++ b/GooglME-1.ipr
@@ -2,13 +2,6 @@
 <project version="4" relativePaths="false">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
-    <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <additionalClassPath />
-      <antReference name="Local Ant" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
   </component>
   <component name="BSFConsole">
     <sendcommandbycontrolenter>false</sendcommandbycontrolenter>
@@ -248,6 +241,16 @@
     </modules>
   </component>
   <component name="ProjectRootManager" version="2" assert-keyword="false" jdk-15="false" project-jdk-name="1.4.x" />
+  <component name="Regex">
+    <option name="pos1" value="218" />
+    <option name="pos2" value="218" />
+    <option name="pos3" value="162" />
+    <option name="pos4" value="444" />
+    <option name="pos5" value="162" />
+    <option name="autoUpdate" value="true" />
+    <option name="referenceOn" value="false" />
+    <option name="referencePos" value="0" />
+  </component>
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />
diff --git a/GooglME-1.iws b/GooglME-1.iws
index 7dc7bfa..86cd76a 100755
--- a/GooglME-1.iws
+++ b/GooglME-1.iws
@@ -115,55 +115,14 @@
     <first-group selected-file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/GooglME.java">
       <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/GooglME.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="697" column="29" selection-start="15773" selection-end="15773" vertical-scroll-proportion="0.4">
-            <folding>
-              <element signature="imports" expanded="true" />
-            </folding>
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/RmsIndex.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="32" column="26" selection-start="1398" selection-end="1398" vertical-scroll-proportion="0.07804878">
-            <folding>
-              <element signature="imports" expanded="true" />
-            </folding>
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HistoryScreen.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="59" column="56" selection-start="2223" selection-end="2223" vertical-scroll-proportion="0.66341466">
+          <state line="115" column="16" selection-start="3617" selection-end="3617" vertical-scroll-proportion="0.97969544">
             <folding />
           </state>
         </provider>
       </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HelpScreen.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="65" column="49" selection-start="2784" selection-end="2784" vertical-scroll-proportion="0.58">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/MainScreen.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="56" column="38" selection-start="2262" selection-end="2262" vertical-scroll-proportion="0.36747968">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/PrefsScreen.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="57" column="36" selection-start="2190" selection-end="2190" vertical-scroll-proportion="0.43252033">
-            <folding>
-              <element signature="imports" expanded="true" />
-            </folding>
-          </state>
-        </provider>
-      </entry>
       <entry file="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me/googlme/Util.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="33" column="6" selection-start="1617" selection-end="1617" vertical-scroll-proportion="0.64715445">
+          <state line="86" column="23" selection-start="2756" selection-end="2756" vertical-scroll-proportion="0.72772276">
             <folding />
           </state>
         </provider>
@@ -179,24 +138,19 @@
   <component name="InspectionManager">
     <option name="AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="SPLITTER_PROPORTION" value="0.5" />
-    <profile name="Erik's Inspections" />
+    <profile name="Default" />
   </component>
   <component name="J2EEProjectPane" />
   <component name="NamedScopeManager" />
   <component name="PackagesPane">
-    <expanded_node url="net.thauvin" module="GooglME-1" type="package" />
     <expanded_node url="net.thauvin.j2me.googlme" module="GooglME-1" type="package" />
+    <expanded_node url="net.thauvin" module="GooglME-1" type="package" />
     <expanded_node url="net" module="GooglME-1" type="package" />
-    <expanded_node url="" module="GooglME-1" type="module" />
     <expanded_node url="net.thauvin.j2me" module="GooglME-1" type="package" />
+    <expanded_node url="" module="GooglME-1" type="module" />
   </component>
   <component name="ProjectPane">
-    <expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/j2me" module="GooglME-1" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme" module="GooglME-1" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src" module="GooglME-1" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$" module="GooglME-1" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net/thauvin" module="GooglME-1" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net" module="GooglME-1" type="directory" />
     <expanded_node url="" module="GooglME-1" type="module" />
   </component>
   <component name="ProjectView">
@@ -219,32 +173,8 @@
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
   </component>
-  <component name="Regex">
-    <option name="pos1" value="218" />
-    <option name="pos2" value="218" />
-    <option name="pos3" value="162" />
-    <option name="pos4" value="444" />
-    <option name="pos5" value="162" />
-    <option name="autoUpdate" value="true" />
-    <option name="referenceOn" value="false" />
-    <option name="referencePos" value="0" />
-  </component>
   <component name="RunManager">
     <activeType name="Application" />
-    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
-      <option name="WORKING_DIRECTORY" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="7001" />
-      <option name="LOCAL" value="true" />
-      <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="/" />
-      <option name="COMMON_VM_ARGUMENTS" value="" />
-      <option name="DOMAIN_PATH" value="" />
-      <option name="USER" value="weblogic" />
-      <option name="PASSWORD" value="weblogic" />
-      <option name="SERVER_NAME" value="myserver" />
-      <option name="DOMAIN_NAME" value="mydomain" />
-    </configuration>
     <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="PACKAGE_NAME" />
@@ -259,6 +189,13 @@
         <value defaultName="wholeProject" />
       </option>
     </configuration>
+    <configuration selected="false" default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
     <configuration selected="false" default="true" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" />
@@ -266,6 +203,20 @@
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <module name="" />
     </configuration>
+    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
+      <option name="WORKING_DIRECTORY" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="7001" />
+      <option name="LOCAL" value="true" />
+      <option name="OPEN_IN_BROWSER" value="true" />
+      <option name="OPEN_IN_BROWSER_URL" value="/" />
+      <option name="COMMON_VM_ARGUMENTS" value="" />
+      <option name="DOMAIN_PATH" value="" />
+      <option name="USER" value="weblogic" />
+      <option name="PASSWORD" value="weblogic" />
+      <option name="SERVER_NAME" value="myserver" />
+      <option name="DOMAIN_NAME" value="mydomain" />
+    </configuration>
     <configuration selected="false" default="true" type="Applet" factoryName="Applet">
       <module name="" />
       <option name="MAIN_CLASS_NAME" />
@@ -276,13 +227,6 @@
       <option name="POLICY_FILE" value="C:/IntelliJ-IDEA/bin/appletviewer.policy" />
       <option name="VM_PARAMETERS" />
     </configuration>
-    <configuration selected="false" default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
   </component>
   <component name="SelectInManager" />
   <component name="StarteamConfiguration">
@@ -330,28 +274,26 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1288" height="808" extended-state="0" />
+    <frame x="-4" y="-4" width="1032" height="776" extended-state="0" />
     <editor active="true" />
     <layout>
+      <window_info id="Properties File Structure" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="4" />
       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.12540454" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33032128" order="1" />
-      <window_info id="Jalopy" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2734694" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33032128" order="8" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3995984" order="6" />
-      <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.22244897" order="0" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="1" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39969134" order="6" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.11245955" order="2" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
       <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="1" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" />
       <window_info id="BSFConsole" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
-      <window_info id="Properties File Structure" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="4" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="1" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
       <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
@@ -424,84 +366,18 @@
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <antCommandLine value="" />
-      <runInBackground value="false" />
-      <targetFilters>
-        <filter targetName="jar" isVisible="false" />
-        <filter targetName="compile-2" isVisible="false" />
-        <filter targetName="compile" isVisible="false" />
-        <filter targetName="init" isVisible="false" />
-        <filter targetName="build" isVisible="true" />
-        <filter targetName="run-2" isVisible="false" />
-        <filter targetName="clean" isVisible="false" />
-        <filter targetName="run" isVisible="false" />
-        <filter targetName="jar-2" isVisible="false" />
-      </targetFilters>
-      <treeView value="true" />
-      <verbose value="true" />
-      <viewClosedWhenNoErrors value="false" />
-    </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://C:/j2sdk1.4.2_07/src.zip!/java/lang/Thread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="515" column="36" selection-start="20698" selection-end="20698" vertical-scroll-proportion="0.3329753">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/GooglME.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="697" column="29" selection-start="15773" selection-end="15773" vertical-scroll-proportion="0.4">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/RmsIndex.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="26" selection-start="1398" selection-end="1398" vertical-scroll-proportion="0.07804878">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HistoryScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="59" column="56" selection-start="2223" selection-end="2223" vertical-scroll-proportion="0.66341466">
+        <state line="115" column="16" selection-start="3617" selection-end="3617" vertical-scroll-proportion="0.97969544">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HelpScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="65" column="49" selection-start="2784" selection-end="2784" vertical-scroll-proportion="0.58">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/MainScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="56" column="38" selection-start="2262" selection-end="2262" vertical-scroll-proportion="0.36747968">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/PrefsScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="36" selection-start="2190" selection-end="2190" vertical-scroll-proportion="0.43252033">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me/googlme/Util.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="6" selection-start="1617" selection-end="1617" vertical-scroll-proportion="0.64715445">
+        <state line="86" column="23" selection-start="2756" selection-end="2756" vertical-scroll-proportion="0.72772276">
           <folding />
         </state>
       </provider>
diff --git a/GooglME-2.ipr b/GooglME-2.ipr
index 03dbe27..de114e2 100755
--- a/GooglME-2.ipr
+++ b/GooglME-2.ipr
@@ -36,9 +36,7 @@
       <language name="vbscript" engine="org.apache.bsf.engines.activescript.ActiveScriptEngine" />
     </languages>
     <startupscripts />
-    <preferredrecentcommandsdividerlocations>
-      <dividerlocationd language="beanshell" position="1352" />
-    </preferredrecentcommandsdividerlocations>
+    <preferredrecentcommandsdividerlocations />
     <BSFConsoleSearchOptions searchfromcursor="false">
       <recentsearches />
     </BSFConsoleSearchOptions>
@@ -243,6 +241,16 @@
     </modules>
   </component>
   <component name="ProjectRootManager" version="2" assert-keyword="false" jdk-15="false" project-jdk-name="1.4.x" />
+  <component name="Regex">
+    <option name="pos1" value="218" />
+    <option name="pos2" value="218" />
+    <option name="pos3" value="162" />
+    <option name="pos4" value="444" />
+    <option name="pos5" value="162" />
+    <option name="autoUpdate" value="true" />
+    <option name="referenceOn" value="false" />
+    <option name="referencePos" value="0" />
+  </component>
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />
     <option name="DEBUGGING_INFO" value="true" />
diff --git a/GooglME-2.iws b/GooglME-2.iws
index eac11b6..1d2e2a5 100755
--- a/GooglME-2.iws
+++ b/GooglME-2.iws
@@ -115,72 +115,35 @@
     <first-group selected-file="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me/googlme/Util.java">
       <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/GooglME.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="730" column="31" selection-start="16671" selection-end="16671" vertical-scroll-proportion="0.84210527">
+          <state line="61" column="13" selection-start="2377" selection-end="2377" vertical-scroll-proportion="0.33333334">
             <folding />
           </state>
         </provider>
       </entry>
       <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HelpScreen.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="50" column="13" selection-start="2084" selection-end="2084" vertical-scroll-proportion="0.25982532">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/build.xml" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/GooglME-2.jad" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="3" column="19" selection-start="139" selection-end="139" vertical-scroll-proportion="0.054779805">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me/googlme/Util.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="62" column="8" selection-start="2339" selection-end="2339" vertical-scroll-proportion="0.2706767">
+          <state line="42" column="76" selection-start="1782" selection-end="1782" vertical-scroll-proportion="0.10321489">
             <folding />
           </state>
         </provider>
       </entry>
       <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/MainScreen.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="68" column="11" selection-start="2449" selection-end="2449" vertical-scroll-proportion="0.59183675">
-            <folding>
-              <element signature="imports" expanded="true" />
-            </folding>
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/PrefsScreen.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="51" column="13" selection-start="2086" selection-end="2086" vertical-scroll-proportion="0.2556391">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/RmsIndex.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="30" column="13" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.18259935">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HistoryScreen.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="49" column="13" selection-start="2005" selection-end="2005" vertical-scroll-proportion="0.2556391">
+          <state line="52" column="13" selection-start="2077" selection-end="2077" vertical-scroll-proportion="0.33333334">
             <folding />
           </state>
         </provider>
       </entry>
       <entry file="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me/googlme/Util.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="33" column="6" selection-start="1617" selection-end="1617" vertical-scroll-proportion="0.5821697">
+          <state line="53" column="13" selection-start="2067" selection-end="2067" vertical-scroll-proportion="0.33333334">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me/googlme/Util.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.6419142">
             <folding />
           </state>
         </provider>
@@ -196,35 +159,30 @@
   <component name="InspectionManager">
     <option name="AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="SPLITTER_PROPORTION" value="0.5" />
-    <profile name="Erik's Inspections" />
+    <profile name="Default" />
   </component>
   <component name="J2EEProjectPane" />
   <component name="NamedScopeManager" />
   <component name="PackagesPane">
-    <expanded_node url="net" module="GooglME-2" type="package" />
-    <expanded_node url="net.thauvin.j2me" module="GooglME-2" type="package" />
-    <expanded_node url="" module="GooglME-2" type="module" />
     <expanded_node url="net.thauvin.j2me.googlme" module="GooglME-2" type="package" />
     <expanded_node url="net.thauvin" module="GooglME-2" type="package" />
+    <expanded_node url="net.thauvin.j2me" module="GooglME-2" type="package" />
+    <expanded_node url="net" module="GooglME-2" type="package" />
+    <expanded_node url="" module="GooglME-2" type="module" />
   </component>
   <component name="ProjectPane">
-    <expanded_node url="file://$PROJECT_DIR$" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-2/net/thauvin" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/j2me" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-1/net/thauvin" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-1/net" module="GooglME-2" type="directory" />
-    <expanded_node url="" module="GooglME-2" type="module" />
-    <expanded_node url="file://$PROJECT_DIR$/src" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-2/net" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net/thauvin" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-1" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-2" module="GooglME-2" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me/googlme" module="GooglME-2" type="directory" />
-    <expanded_node url="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me" module="GooglME-2" type="directory" />
     <expanded_node url="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me/googlme" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-2/net" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-1/net/thauvin" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-2" module="GooglME-2" type="directory" />
+    <expanded_node url="" module="GooglME-2" type="module" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-1/net" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-1" module="GooglME-2" type="directory" />
+    <expanded_node url="file://$PROJECT_DIR$/midp-2/net/thauvin" module="GooglME-2" type="directory" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" splitterProportion="0.5">
@@ -246,41 +204,14 @@
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
   </component>
-  <component name="Regex">
-    <option name="pos1" value="218" />
-    <option name="pos2" value="218" />
-    <option name="pos3" value="162" />
-    <option name="pos4" value="444" />
-    <option name="pos5" value="162" />
-    <option name="autoUpdate" value="true" />
-    <option name="referenceOn" value="false" />
-    <option name="referencePos" value="0" />
-  </component>
   <component name="RunManager">
     <activeType name="Application" />
-    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
-      <option name="WORKING_DIRECTORY" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="7001" />
-      <option name="LOCAL" value="true" />
-      <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="/" />
-      <option name="COMMON_VM_ARGUMENTS" value="" />
-      <option name="DOMAIN_PATH" value="" />
-      <option name="USER" value="weblogic" />
-      <option name="PASSWORD" value="weblogic" />
-      <option name="SERVER_NAME" value="myserver" />
-      <option name="DOMAIN_NAME" value="mydomain" />
-    </configuration>
-    <configuration selected="false" default="true" type="Applet" factoryName="Applet">
-      <module name="" />
+    <configuration selected="false" default="true" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="C:/IntelliJ-IDEA/bin/appletviewer.policy" />
       <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <module name="" />
     </configuration>
     <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
@@ -296,6 +227,20 @@
         <value defaultName="wholeProject" />
       </option>
     </configuration>
+    <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
+      <option name="WORKING_DIRECTORY" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="7001" />
+      <option name="LOCAL" value="true" />
+      <option name="OPEN_IN_BROWSER" value="true" />
+      <option name="OPEN_IN_BROWSER_URL" value="/" />
+      <option name="COMMON_VM_ARGUMENTS" value="" />
+      <option name="DOMAIN_PATH" value="" />
+      <option name="USER" value="weblogic" />
+      <option name="PASSWORD" value="weblogic" />
+      <option name="SERVER_NAME" value="myserver" />
+      <option name="DOMAIN_NAME" value="mydomain" />
+    </configuration>
     <configuration selected="false" default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -303,12 +248,15 @@
       <option name="HOST" value="localhost" />
       <option name="PORT" value="5005" />
     </configuration>
-    <configuration selected="false" default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <configuration selected="false" default="true" type="Applet" factoryName="Applet">
       <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="C:/IntelliJ-IDEA/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
     </configuration>
   </component>
   <component name="SelectInManager" />
@@ -357,28 +305,26 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="88" y="10" width="1445" height="1124" extended-state="0" />
-    <editor active="true" />
+    <frame x="-4" y="-4" width="1032" height="776" extended-state="6" />
+    <editor active="false" />
     <layout>
-      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33032128" order="8" />
+      <window_info id="Properties File Structure" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="4" />
+      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.17516153" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33032128" order="1" />
-      <window_info id="Jalopy" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2387755" order="0" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="1" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3995984" order="6" />
-      <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39969134" order="6" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
       <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="1" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" />
-      <window_info id="BSFConsole" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33032128" order="8" />
-      <window_info id="Properties File Structure" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="4" />
+      <window_info id="BSFConsole" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="1" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
       <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
@@ -453,88 +399,37 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/googlme.wml">
+    <entry file="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me/googlme/Util.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="46" selection-start="328" selection-end="328" vertical-scroll-proportion="0.21911922">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/GooglME.jad">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="19" selection-start="137" selection-end="137" vertical-scroll-proportion="0.054779805">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HelpScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="50" column="13" selection-start="2084" selection-end="2084" vertical-scroll-proportion="0.25982532">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/GooglME-2.jad">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="19" selection-start="139" selection-end="139" vertical-scroll-proportion="0.054779805">
+        <state line="53" column="13" selection-start="2067" selection-end="2067" vertical-scroll-proportion="0.33333334">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/midp-1/net/thauvin/j2me/googlme/Util.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="62" column="8" selection-start="2339" selection-end="2339" vertical-scroll-proportion="0.2706767">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.6419142">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/MainScreen.java">
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HelpScreen.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="68" column="11" selection-start="2449" selection-end="2449" vertical-scroll-proportion="0.59183675">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/PrefsScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="51" column="13" selection-start="2086" selection-end="2086" vertical-scroll-proportion="0.2556391">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/RmsIndex.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="30" column="13" selection-start="1360" selection-end="1360" vertical-scroll-proportion="0.18259935">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/HistoryScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="49" column="13" selection-start="2005" selection-end="2005" vertical-scroll-proportion="0.2556391">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/midp-2/net/thauvin/j2me/googlme/Util.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="6" selection-start="1617" selection-end="1617" vertical-scroll-proportion="0.5821697">
+        <state line="42" column="76" selection-start="1782" selection-end="1782" vertical-scroll-proportion="0.10321489">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/GooglME.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="730" column="31" selection-start="16671" selection-end="16671" vertical-scroll-proportion="0.84210527">
+        <state line="61" column="13" selection-start="2377" selection-end="2377" vertical-scroll-proportion="0.33333334">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/j2me/googlme/MainScreen.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="52" column="13" selection-start="2077" selection-end="2077" vertical-scroll-proportion="0.33333334">
           <folding />
         </state>
       </provider>
diff --git a/GooglME-2.jad b/GooglME-2.jad
index 968d158..6e43448 100755
--- a/GooglME-2.jad
+++ b/GooglME-2.jad
@@ -1,10 +1,10 @@
 MIDlet-1: GooglME,/googlme.png,net.thauvin.j2me.googlme.GooglME
 MIDlet-Jar-URL: GooglME-2.jar
 MIDlet-Icon: /googlme.png
-MIDlet-Version: 0.4.2
-MIDlet-Description: GooglME
+MIDlet-Version: 0.1.0
+MIDlet-Description: GoogleME
 MIDlet-Name: GooglME
 MIDlet-Vendor: Erik C. Thauvin
-MIDlet-Info-URL: http://mobile.thauvin.net/j2me/
+MIDlet-Info-URL: http://www.thauvin.net/erik/j2me/
 MicroEdition-Profile: MIDP-2.0
 MIDlet-Permissions: javax.microedition.io.Connector.sms,javax.wireless.messaging.sms.send
\ No newline at end of file
diff --git a/GooglME.jad b/GooglME.jad
index cf7964e..4cb8261 100755
--- a/GooglME.jad
+++ b/GooglME.jad
@@ -1,8 +1,8 @@
 MIDlet-1: GooglME,/googlme.png,net.thauvin.j2me.googlme.GooglME
 MIDlet-Jar-URL: GooglME.jar
 MIDlet-Icon: /googlme.png
-MIDlet-Version: 0.4.2
-MIDlet-Description: GooglME
+MIDlet-Version: 0.1.0
+MIDlet-Description: GoogleME
 MIDlet-Name: GooglME
 MIDlet-Vendor: Erik C. Thauvin
-MIDlet-Info-URL: http://mobile.thauvin.net/j2me/
+MIDlet-Info-URL: http://www.thauvin.net/erik/j2me/
diff --git a/build.xml b/build.xml
index d161a10..95d1342 100755
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project name="GooglME" default="build" basedir=".">
 	<taskdef resource="antenna.properties"/>
 
@@ -53,7 +53,7 @@
 	</target>
 	
 	<target name="jar" depends="compile" description="Builds the MIDP 1.x jar">
-		<property name="wtk.midp.version" value="1.0"/>
+		<property name=" wtk.midp.version" value="1.0"/>
 		<copy todir="${path.deploy}" file="${ant.project.name}.jad"/>
 		<wtkpackage jarfile="${path.deploy}/${ant.project.name}.jar"
 					jadfile="${path.deploy}/${ant.project.name}.jad"
@@ -86,7 +86,7 @@
 		<wtkrun jadfile="${path.deploy}/${ant.project.name}-2.jad" device="DefaultColorPhone" wait="true"/>
 	</target>
 	
-	<target name="build" depends="jar,clean,jar-2" description="Rebuilds project">
+	<target name="build" depends="jar,jar-2" description="Rebuilds project">
 	</target>
 	
 	<target name="clean" depends="init" description="Removes classses">
diff --git a/googlme.gif b/googlme.gif
index 3f1852a..3f42cfd 100755
Binary files a/googlme.gif and b/googlme.gif differ
diff --git a/googlme.wml b/googlme.wml
index 837758b..c7d238a 100755
--- a/googlme.wml
+++ b/googlme.wml
@@ -8,17 +8,17 @@
 	</template>
 	<card id="card1" title="GooglME" newcontext="true">
 		<p align="center">
-			GoogleME 0.4.2 (~13Kb)<br/>
+			GoogleME 0.1 (7Kb)<br/>
 		</p>
 		<p align="center">
 			MIDP 2.0<br/>
-			<a href="GooglME-2.jad">Download Jad</a><br/>
-			<a href="GooglME-2.jar">Download Jar</a><br/>
+			<a href="GoogleME-2.jad">Download Jad</a><br/>
+			<a href="GoogleME-2.jar">Download Jar</a><br/>
 		</p>
 		<p align="center">
 			MIDP 1.0<br/>
-			<a href="GooglME.jad">Download Jad</a><br/>
-			<a href="GooglME.jar">Download Jar</a><br/>
+			<a href="GoogleME.jad">Download Jad</a><br/>
+			<a href="GoogleME.jar">Download Jar</a><br/>
 		</p>
 	</card>
 </wml>
diff --git a/lib/cldcapi10.jar b/lib/cldcapi10.jar
index d53b92b..9b4bf49 100755
Binary files a/lib/cldcapi10.jar and b/lib/cldcapi10.jar differ
diff --git a/lib/midpapi10.jar b/lib/midpapi10.jar
index 58514a9..f7a0634 100755
Binary files a/lib/midpapi10.jar and b/lib/midpapi10.jar differ
diff --git a/lib/midpapi20.jar b/lib/midpapi20.jar
index 46d9dc0..9969041 100755
Binary files a/lib/midpapi20.jar and b/lib/midpapi20.jar differ
diff --git a/licenses/RmsIndex License.txt b/licenses/RmsIndex License.txt
deleted file mode 100644
index c5e2d86..0000000
--- a/licenses/RmsIndex License.txt	
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The  above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
\ No newline at end of file
diff --git a/midp-1/net/thauvin/j2me/googlme/Util.java b/midp-1/net/thauvin/j2me/googlme/Util.java
index 162ef32..3b9c55e 100755
--- a/midp-1/net/thauvin/j2me/googlme/Util.java
+++ b/midp-1/net/thauvin/j2me/googlme/Util.java
@@ -1,7 +1,7 @@
 /*
  * @(#)Util.java
  *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
+ * Copyright (c) 2004, Erik C. Thauvin (http://www.thauvin.net/erik/)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,28 +46,19 @@ import javax.microedition.lcdui.TextField;
 /**
  * The <code>Util</code> class implements methods specific to MIDP 1.x.
  *
- * @author  <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
+ * @author <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
  * @version $Revision$, $Date$
+ *
  * @created October 8, 2004
- * @since   1.0
+ * @since 1.0
  */
 public class Util
 {
-	/**
-	 * Disables the default constructor.
-	 *
-	 * @throws UnsupportedOperationException if the constructor is called.
-	 */
-	private Util()
-	{
-		;
-	}
-
 	/**
 	 * Returns a new exclusive choice group.
 	 *
-	 * @param  title   The title.
-	 * @param  choices The choices.
+	 * @param title The title.
+	 * @param choices The choices.
 	 *
 	 * @return The choice group.
 	 */
@@ -80,7 +71,7 @@ public class Util
 	 * Sets the current item.
 	 *
 	 * @param screen The screen.
-	 * @param item   The item.
+	 * @param item The item.
 	 */
 	public static void setCurrentItem(Display screen, Item item)
 	{
@@ -90,7 +81,7 @@ public class Util
 	/**
 	 * Sets the initial input mode of the given text field.
 	 *
-	 * @param field     The text field.
+	 * @param field The text field.
 	 * @param inputMode The input mode.
 	 */
 	public static void setInitialInputMode(TextField field, String inputMode)
diff --git a/midp-2/net/thauvin/j2me/googlme/Util.java b/midp-2/net/thauvin/j2me/googlme/Util.java
index 4fe5377..70b6f91 100755
--- a/midp-2/net/thauvin/j2me/googlme/Util.java
+++ b/midp-2/net/thauvin/j2me/googlme/Util.java
@@ -1,7 +1,7 @@
 /*
  * @(#)Util.java
  *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
+ * Copyright (c) 2004, Erik C. Thauvin (http://www.thauvin.net/erik/)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,26 +45,19 @@ import javax.microedition.lcdui.TextField;
 /**
  * The <code>Util</code> class implements methods specific to MIDP 2.x.
  *
- * @author  <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
+ * @author <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
  * @version $Revision$, $Date$
+ *
  * @created October 8, 2004
- * @since   1.0
+ * @since 1.0
  */
 public class Util
 {
-	/**
-	 * Disables the default constructor.
-	 */
-	private Util()
-	{
-		;
-	}
-
 	/**
 	 * Returns a new exclusive choice group.
 	 *
-	 * @param  title   The title.
-	 * @param  choices The choices.
+	 * @param title The title.
+	 * @param choices The choices.
 	 *
 	 * @return The choice group.
 	 */
@@ -75,9 +68,8 @@ public class Util
 
 	/**
 	 * Sets the current item.
-	 *
 	 * @param screen The screen.
-	 * @param item   The item.
+	 * @param item The item.
 	 */
 	public static void setCurrentItem(Display screen, Item item)
 	{
@@ -87,7 +79,7 @@ public class Util
 	/**
 	 * Sets the initial input mode of the given text field.
 	 *
-	 * @param field     The text field.
+	 * @param field The text field.
 	 * @param inputMode The input mode.
 	 */
 	public static void setInitialInputMode(TextField field, String inputMode)
diff --git a/res/.cvsignore b/res/.cvsignore
deleted file mode 100644
index 98e6ef6..0000000
--- a/res/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/res/.gitignore b/res/.gitignore
deleted file mode 100644
index 0acd18c..0000000
--- a/res/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Thumbs.db
diff --git a/src/net/thauvin/j2me/googlme/.gitignore b/src/net/thauvin/j2me/googlme/.gitignore
deleted file mode 100644
index a0fa60b..0000000
--- a/src/net/thauvin/j2me/googlme/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/desktop.ini
diff --git a/src/net/thauvin/j2me/googlme/GooglME.java b/src/net/thauvin/j2me/googlme/GooglME.java
index 7d90976..3890af5 100755
--- a/src/net/thauvin/j2me/googlme/GooglME.java
+++ b/src/net/thauvin/j2me/googlme/GooglME.java
@@ -1,7 +1,7 @@
 /*
  * @(#)GooglME.java
  *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
+ * Copyright (c) 2004, Erik C. Thauvin (http://www.thauvin.net/erik/)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,220 +36,83 @@
  */
 package net.thauvin.j2me.googlme;
 
-import java.util.Vector;
-
-import javax.microedition.io.Connector;
-import javax.microedition.lcdui.*;
+import javax.microedition.io.*;
+import javax.microedition.lcdui.Alert;
+import javax.microedition.lcdui.AlertType;
+import javax.microedition.lcdui.Command;
+import javax.microedition.lcdui.CommandListener;
+import javax.microedition.lcdui.Display;
+import javax.microedition.lcdui.Displayable;
+import javax.microedition.lcdui.Item;
 import javax.microedition.midlet.MIDlet;
 import javax.microedition.midlet.MIDletStateChangeException;
-import javax.microedition.rms.RecordStoreException;
 
-import javax.wireless.messaging.MessageConnection;
-import javax.wireless.messaging.TextMessage;
+import javax.wireless.messaging.*;
 
 
 /**
  * The <code>GooglME</code> class implements a simple front-end for Google SMS.
  *
- * @author  <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
+ * @author <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
  * @version $Revision$, $Date$
+ *
  * @created October 8, 2004
- * @since   1.0
+ * @since 1.0
  */
 public class GooglME extends MIDlet implements CommandListener, Runnable
 {
-	/**
-	 * Definition choice.
-	 */
-	protected static final String CHOICE_DEFINITION = "Definition";
-
-	/**
-	 * Froogle Prices choice.
-	 */
-	protected static final String CHOICE_FROOGLE_PRICES = "Froogle Prices";
-
-	/**
-	 * Google Local choice.
-	 */
-	protected static final String CHOICE_GOOGLE_LOCAL = "Google Local";
-
-	/**
-	 * Google Search choice.
-	 */
-	protected static final String CHOICE_GOOGLE_SEARCH = "Google Search";
-
-	/**
-	 * Google SMS choice.
-	 */
-	protected static final String CHOICE_GOOGLE_SMS = "Google SMS";
-
-	/**
-	 * Google Weather choice.
-	 */
-	protected static final String CHOICE_WEATHER = "Weather";
-
-	/**
-	 * Local Showtimes choice.
-	 */
-	protected static final String CHOICE_LOCAL_SHOWTIMES = "Local Showtimes";
-
-	/**
-	 * Movie Showtimes choice.
-	 */
-	protected static final String CHOICE_MOVIE_SHOWTIMES = "Movie Showtimes";
-
-
 	/**
 	 * The <code>About</code> command.
 	 */
-	protected static final Command COMMAND_ABOUT = new Command("About", Command.SCREEN, 2);
-
-	/**
-	 * The application name.
-	 */
-	protected static final String APP_NAME = "GooglME";
-
-	/**
-	 * The application version.
-	 */
-	protected static final String APP_VERSION = "0.4.2";
+	protected /* final */ Command aboutCommand = new Command("About", Command.SCREEN, 5);
 
 	/**
 	 * The <code>Back</code> command.
 	 */
-	protected static final Command COMMAND_BACK = new Command("Back", Command.BACK, 2);
-
-	/**
-	 * The action choices.
-	 */
-	protected static final String[] CHOICES = new String[]
-											  {
-												  CHOICE_GOOGLE_SMS, CHOICE_GOOGLE_LOCAL, CHOICE_FROOGLE_PRICES,
-												  CHOICE_GOOGLE_SEARCH, CHOICE_MOVIE_SHOWTIMES, CHOICE_LOCAL_SHOWTIMES,
-												  CHOICE_DEFINITION, CHOICE_WEATHER
-											  };
+	protected /* final */ Command backCommand = new Command("Back", Command.BACK, 2);
 
 	/**
 	 * The <code>Clear</code> command.
 	 */
-	protected static final Command COMMAND_CLEAR = new Command("Clear", Command.SCREEN, 2);
+	protected /* final */ Command clearCommand = new Command("Clear", Command.SCREEN, 3);
 
 	/**
 	 * The <code>Exit</code> command.
 	 */
-	protected static final Command COMMAND_EXIT = new Command("Exit", Command.EXIT, 2);
+	protected /* final */ Command exitCommand = new Command("Exit", Command.EXIT, 2);
 
 	/**
 	 * The <code>Help</code> command.
 	 */
-	protected static final Command COMMAND_HELP = new Command("Help", Command.HELP, 2);
-
-	/**
-	 * The <code>History</code> command.
-	 */
-	protected static final Command COMMAND_HISTORY = new Command("History", Command.SCREEN, 2);
-
-	/**
-	 * The <code>Settings</code> command.
-	 */
-	protected static final Command COMMAND_SETTINGS = new Command("Settings", Command.SCREEN, 2);
-
-	/**
-	 * The <code>Save</code> command.
-	 */
-	protected static final Command COMMAND_SAVE = new Command("Save", Command.OK, 1);
+	protected /* final */ Command helpCommand = new Command("Help", Command.HELP, 4);
 
 	/**
 	 * The <code>Send</code> command.
 	 */
-	protected static final Command COMMAND_SEND = new Command("Send", Command.OK, 1);
+	protected /* final */ Command sendCommand = new Command("Send", Command.SCREEN, 2);
 
 	/**
-	 * The history maximum size.
+	 * The application name.
 	 */
-	private static final int MAX_HISTORY = 8;
+	protected /* final */ String appName = "GooglME";
 
 	/**
-	 * The description query prefix.
+	 * The application version.
 	 */
-	private static final String PREFIX_DEFINITION = "d ";
+	protected /* final */ String appVersion = "0.1";
+	private Display display;
 
 	/**
-	 * The Google query prefix.
+	 * The help screen.
 	 */
-	private static final String PREFIX_GOOGLE = "g ";
+	private /* final */ HelpScreen helpScreen;
 
 	/**
-	 * The Froogle query prefix.
+	 * The main screen.
 	 */
-	private static final String PREFIX_FROOGLE = "f ";
-
-	/**
-	 * The Movie query prefix.
-	 */
-	private static final String PREFIX_MOVIE = "movie: ";
-
-	/**
-	 * The Weather query prefix.
-	 */
-	private static final String PREFIX_WEATHER = "weather ";
-
-	/**
-	 * The history preferences key.
-	 */
-	private static final String PREFS_HISTORY_KEY = "h";
-
-	/**
-	 * The location preferences key.
-	 */
-	private static final String PREFS_LOCATION_KEY = "l";
-
-	/**
-	 * The address preferences key.
-	 */
-	private static final String PREFS_ADDRESS_KEY = "a";
-
-	// The current action.
-	private String _action = CHOICE_GOOGLE_SMS;
-
-	// The Google SMS address.
-	private String _address = "46645";
-
-	// The default error/message alert dialog.
-	private Alert _defaultAlert;
-
-	// The display instance.
-	private Display _display;
-
-	// The first time flag.
-	private boolean _firstTime;
-
-	// The help screen.
-	private HelpScreen _helpScreen;
-
-	// The history.
-	private /* final */ Vector _history = new Vector(8);
-
-	// The history screen.
-	private HistoryScreen _historyScreen;
-
-	// The location.
-	private String _location = "";
-
-	// The main screen.
-	private /* final */ MainScreen _mainScreen;
-
-	// The preferences store.
-	private RmsIndex _prefs;
-
-	// The preferences screen.
-	private PrefsScreen _prefsScreen;
-
-	// The current query.
-	private String _query = "";
-
-	// The sending message alert dialog.
-	private Alert _sendingAlert;
+	private /* final */ MainScreen mainScreen;
+	private String query;
+	private int action;
 
 	/**
 	 * Creates a new GooglME instance.
@@ -258,8 +121,7 @@ public class GooglME extends MIDlet implements CommandListener, Runnable
 	{
 		super();
 
-		_mainScreen = new MainScreen(this);
-		_firstTime = true;
+		mainScreen = new MainScreen(this);
 	}
 
 	/**
@@ -268,199 +130,56 @@ public class GooglME extends MIDlet implements CommandListener, Runnable
 	 * @param c The command action.
 	 * @param d The diplayable screen.
 	 */
-	public /* final */ void commandAction(Command c, Displayable d)
+	public void commandAction(Command c, Displayable d)
 	{
-		if (c == COMMAND_EXIT)
+		if (c == exitCommand)
 		{
 			exit();
 		}
-		else if (c == COMMAND_ABOUT)
+		else if (c == aboutCommand)
 		{
-			alert("About " + APP_NAME,
-				  APP_NAME + ' ' + APP_VERSION + "\nCopyright 2005\nErik C. Thauvin\nerik@thauvin.net", d, false);
+			msg("About " + appName, appName + ' ' + appVersion + "\nCopyright 2004\nErik C. Thauvin\nerik@thauvin.net",
+				d, false);
 		}
-		else if (c == COMMAND_CLEAR)
+		else if (c == clearCommand)
 		{
-			_mainScreen.queryFld.setString("");
-			Util.setCurrentItem(_display, (Item) _mainScreen.queryFld);
+			mainScreen.queryFld.setString("");
+			Util.setCurrentItem(display, (Item) mainScreen.queryFld);
 		}
-		else if (c == COMMAND_SEND)
+		else if (c == sendCommand)
 		{
-			if (isValidString(_address))
+			query = mainScreen.queryFld.getString();
+			action = mainScreen.actionPopup.getSelectedIndex();
+
+			if ((query != null) && (query.length() > 0))
 			{
-				/* final */ String q = _mainScreen.queryFld.getString();
-				_action = CHOICES[_mainScreen.actionPopup.getSelectedIndex()];
-
-				if (isValidString(q))
-				{
-					if (((_action.equals(CHOICE_GOOGLE_LOCAL)) || (_action.equals(CHOICE_LOCAL_SHOWTIMES))) &&
-							!isValidString(_location))
-					{
-						alert("No Location", "Please set a location first.", d, true);
-					}
-					else
-					{
-						if (_sendingAlert == null)
-						{
-							_sendingAlert = new Alert("");
-						}
-
-						_query = buildQuery(q);
-
-						addHistory(_query);
-						saveHistory();
-
-						alert(_sendingAlert, "Sending SMS", "Sending message to " + _address + "...", d, 2500, false);
-
-						new Thread(this).start();
-					}
-				}
-				else
-				{
-					Util.setCurrentItem(_display, (Item) _mainScreen.queryFld);
-					alert("Invalid Input", "Please specify a query.", d, true);
-				}
+				new Thread(this).start();
 			}
 			else
 			{
-				alert("No SMS Address", "Please set the Google SMS number.", d, true);
+				msg("Invalid Input", "Please specify a query.", d, true);
+				Util.setCurrentItem(display, (Item) mainScreen.queryFld);
 			}
 		}
-		else if (c == COMMAND_SETTINGS)
+		else if (c == helpCommand)
 		{
-			if (_prefsScreen == null)
+			if (helpScreen == null)
 			{
-				_prefsScreen = new PrefsScreen(this);
+				helpScreen = new HelpScreen(this);
 			}
 
-			_prefsScreen.smsFld.setString(_address);
-			_prefsScreen.locationFld.setString(_location);
-
-			_display.setCurrent(_prefsScreen);
+			display.setCurrent(helpScreen);
 		}
-		else if (c == COMMAND_SAVE)
+		else if (c == backCommand)
 		{
-			_location = _prefsScreen.locationFld.getString();
-			_address = _prefsScreen.smsFld.getString();
-
-			_display.setCurrent(_mainScreen);
-
-			saveSettings();
-		}
-		else if (c == COMMAND_HISTORY)
-		{
-			if (_historyScreen == null)
-			{
-				_historyScreen = new HistoryScreen(this);
-			}
-
-			int size = _historyScreen.size();
-
-			if (size > 0)
-			{
-				for (int i = 0; i < size; i++)
-				{
-					_historyScreen.delete(0);
-				}
-			}
-
-			size = _history.size();
-
-			if (size > 0)
-			{
-				for (int i = 0; i < size; i++)
-				{
-					_historyScreen.append((String) _history.elementAt(i), null);
-				}
-
-				_display.setCurrent(_historyScreen);
-			}
-			else
-			{
-				alert("No History", "There is no history to display.", d, true);
-			}
-		}
-		else if (c == List.SELECT_COMMAND)
-		{
-			/* final */ String query = _historyScreen.getString(_historyScreen.getSelectedIndex());
-
-			// Definition
-			if (query.startsWith(PREFIX_DEFINITION))
-			{
-				_mainScreen.queryFld.setString(query.substring(query.indexOf(' ') + 1));
-				_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_DEFINITION), true);
-			}
-
-			// Google
-			else if (query.startsWith(PREFIX_GOOGLE))
-			{
-				_mainScreen.queryFld.setString(query.substring(query.indexOf(' ') + 1));
-				_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_GOOGLE_SEARCH), true);
-			}
-
-			// Froogle
-			else if (query.startsWith(PREFIX_FROOGLE))
-			{
-				_mainScreen.queryFld.setString(query.substring(query.indexOf(' ') + 1));
-				_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_FROOGLE_PRICES), true);
-			}
-
-			// Showtimes
-			else if (query.startsWith(PREFIX_MOVIE))
-			{
-				// Local
-				if (isValidString(_location) && query.endsWith(' ' + _location))
-				{
-					_mainScreen.queryFld.setString(query.substring(PREFIX_MOVIE.length(), query.lastIndexOf(' ')));
-					_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_LOCAL_SHOWTIMES), true);
-				}
-				else
-				{
-					_mainScreen.queryFld.setString(query.substring(PREFIX_MOVIE.length()));
-					_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_MOVIE_SHOWTIMES), true);
-				}
-			}
-
-			// Weather
-			else if (query.startsWith(PREFIX_WEATHER))
-			{
-				_mainScreen.queryFld.setString(query.substring(PREFIX_WEATHER.length()));
-				_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_WEATHER), true);
-			}
-
-			// Local
-			else if (isValidString(_location) && query.endsWith('.' + _location))
-			{
-				_mainScreen.queryFld.setString(query.substring(0, query.lastIndexOf('.')));
-				_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_GOOGLE_LOCAL), true);
-			}
-			else
-			{
-				_mainScreen.queryFld.setString(query);
-				_mainScreen.actionPopup.setSelectedIndex(choiceIndex(CHOICE_GOOGLE_SMS), true);
-			}
-
-			_display.setCurrent(_mainScreen);
-		}
-		else if (c == COMMAND_HELP)
-		{
-			if (_helpScreen == null)
-			{
-				_helpScreen = new HelpScreen(this);
-			}
-
-			_display.setCurrent(_helpScreen);
-		}
-		else if (c == COMMAND_BACK)
-		{
-			_display.setCurrent(_mainScreen);
+			display.setCurrent(mainScreen);
 		}
 	}
 
 	/**
 	 * Executes the thread.
 	 */
-	public /* final */ void run()
+	public void run()
 	{
 		sendSMS();
 	}
@@ -471,25 +190,13 @@ public class GooglME extends MIDlet implements CommandListener, Runnable
 	protected void destroyApp(boolean b)
 					   throws MIDletStateChangeException
 	{
-		try
-		{
-			if (_prefs != null)
-			{
-				_prefs.close();
-			}
-		}
-		catch (RecordStoreException e)
-		{
-			alert("Close Error", "Could not close the preferences store: " + e.getMessage(), _mainScreen, true);
-		}
-
 		notifyDestroyed();
 	}
 
 	/**
 	 * @see javax.microedition.midlet.MIDlet#pauseApp()
 	 */
-	protected /* final */ void pauseApp()
+	protected void pauseApp()
 	{
 		;
 	}
@@ -497,185 +204,11 @@ public class GooglME extends MIDlet implements CommandListener, Runnable
 	/**
 	 * @see javax.microedition.midlet.MIDlet#startApp()
 	 */
-	protected /* final */ void startApp()
-								 throws MIDletStateChangeException
+	protected void startApp()
+					 throws MIDletStateChangeException
 	{
-		if (_firstTime)
-		{
-			try
-			{
-				_prefs = new RmsIndex("GooglME");
-
-				String item;
-
-				// Load the history.
-				for (int i = 0; i < MAX_HISTORY; i++)
-				{
-					item = _prefs.get(PREFS_HISTORY_KEY + i);
-
-					if (item != null)
-					{
-						_history.addElement(item);
-					}
-					else
-					{
-						break;
-					}
-				}
-
-				// Load the location.
-				item = _prefs.get(PREFS_LOCATION_KEY);
-
-				if (item != null)
-				{
-					_location = item;
-				}
-
-				// Load the address.
-				item = _prefs.get(PREFS_ADDRESS_KEY);
-
-				if (item != null)
-				{
-					_address = item;
-				}
-			}
-			catch (RecordStoreException e)
-			{
-				alert("Load Error", "Could not load the preferences: " + e.getMessage(), _mainScreen, true);
-			}
-
-			_firstTime = false;
-		}
-
-		_display = Display.getDisplay(this);
-		_display.setCurrent(_mainScreen);
-	}
-
-	// Return the index of the given choice.
-	private static int choiceIndex(String choice)
-	{
-		for (int i = 0; i < CHOICES.length; i++)
-		{
-			if (CHOICES[i].equals(choice))
-			{
-				return i;
-			}
-		}
-
-		return 0;
-	}
-
-	// Validates a string.
-	private static boolean isValidString(String s)
-	{
-		return ((s != null) && (s.length() > 0));
-	}
-
-	// Adds to the history.
-	private void addHistory(String query)
-	{
-		if (_history.size() == MAX_HISTORY)
-		{
-			_history.removeElementAt(MAX_HISTORY - 1);
-		}
-		
-		_history.insertElementAt(query, 0);
-	}
-
-	// Displays a modal message/error alert dialog.
-	private void alert(String title, String msg, Displayable d, boolean isError)
-	{
-		if (_defaultAlert == null)
-		{
-			_defaultAlert = new Alert("");
-		}
-
-		alert(_defaultAlert, title, msg, d, Alert.FOREVER, isError);
-	}
-
-	// Displays a message/error alert dialog.
-	private void alert(Alert alert, String title, String msg, Displayable d, int timeout, boolean isError)
-	{
-		if (title != null)
-		{
-			alert.setTitle(title);
-		}
-
-		alert.setString(msg);
-		alert.setType(isError ? AlertType.ERROR : AlertType.INFO);
-
-		alert.setTimeout(timeout);
-
-		_display.setCurrent(alert, d);
-	}
-
-	// Builds the full query .
-	private String buildQuery(String query)
-	{
-		/* final */ String text;
-
-		if (_action.equals(CHOICE_GOOGLE_LOCAL))
-		{
-			if (isValidString(_location))
-			{
-				text = query + '.' + _location;
-			}
-			else
-			{
-				text = query;
-			}
-		}
-
-		// Froogle
-		else if (_action.equals(CHOICE_FROOGLE_PRICES))
-		{
-			text = PREFIX_FROOGLE + query;
-		}
-
-		// Google
-		else if (_action.equals(CHOICE_GOOGLE_SEARCH))
-		{
-			text = PREFIX_GOOGLE + query;
-		}
-
-		// Definition
-		else if (_action.equals(CHOICE_DEFINITION))
-		{
-			text = PREFIX_DEFINITION + query;
-		}
-
-		// Showtimes
-		else if (_action.equals(CHOICE_MOVIE_SHOWTIMES))
-		{
-			text = PREFIX_MOVIE + query;
-		}
-
-		// Local Showtimes
-		else if (_action.equals(CHOICE_LOCAL_SHOWTIMES))
-		{
-			if (isValidString(_location))
-			{
-				text = PREFIX_MOVIE + query + ' ' + _location;
-			}
-			else
-			{
-				text = PREFIX_MOVIE + query;
-			}
-		}
-
-		// Weather
-		else if (_action.equals(CHOICE_WEATHER))
-		{
-			text = PREFIX_WEATHER + query;
-		}
-
-		// Default
-		else
-		{
-			text = query;
-		}
-
-		return text;
+		display = Display.getDisplay(this);
+		display.setCurrent(mainScreen);
 	}
 
 	// Exits the application.
@@ -685,58 +218,30 @@ public class GooglME extends MIDlet implements CommandListener, Runnable
 		{
 			destroyApp(false);
 		}
-		catch (MIDletStateChangeException ignore)
+		catch (MIDletStateChangeException e)
 		{
-			; // Do nothing
+			; // Do nothing 
 		}
 	}
 
-	// Saves the history.
-	private void saveHistory()
+	// Displays a message/error dialog.
+	private void msg(String title, String msg, Displayable d, boolean isError)
 	{
-		try
-		{
-			if (_prefs != null)
-			{
-				/* final */ int size = _history.size();
+		/* final */ Alert alert = new Alert(title, msg, null, AlertType.INFO);
 
-				// Save the history.
-				for (int i = 0; i < size; i++)
-				{
-					_prefs.put(PREFS_HISTORY_KEY + i, (String) _history.elementAt(i));
-				}
-			}
-		}
-		catch (RecordStoreException e)
+		if (isError)
 		{
-			alert("Save Error", "Could not save the history: " + e.getMessage(), _mainScreen, true);
+			alert.setType(AlertType.ERROR);
 		}
-	}
 
-	// Saves the settings.
-	private void saveSettings()
-	{
-		try
-		{
-			if (_prefs != null)
-			{
-				// Save the location.
-				_prefs.put(PREFS_LOCATION_KEY, _location);
-
-				// Save the address.
-				_prefs.put(PREFS_ADDRESS_KEY, _address);
-			}
-		}
-		catch (RecordStoreException e)
-		{
-			alert("Save Error", "Could not save the settings: " + e.getMessage(), _mainScreen, true);
-		}
+		alert.setTimeout(Alert.FOREVER);
+		display.setCurrent(alert, d);
 	}
 
 	// Sends the SMS.
 	private void sendSMS()
 	{
-		/* final */ String address = "sms://" + _address;
+		/* final */ String address = "sms://46645";
 		MessageConnection conn = null;
 
 		try
@@ -746,19 +251,35 @@ public class GooglME extends MIDlet implements CommandListener, Runnable
 			/* final */ TextMessage msg = (TextMessage) conn.newMessage(MessageConnection.TEXT_MESSAGE);
 			msg.setAddress(address);
 
-			msg.setPayloadText(_query);
+			// Froogle
+			if (action == 1)
+			{
+				msg.setPayloadText("f " + query);
+			}
+
+			// Google
+			else if (action == 2)
+			{
+				msg.setPayloadText("g " + query);
+			}
+
+			// Definition
+			else if (action == 3)
+			{
+				msg.setPayloadText("d " + query);
+			}
+			else
+			{
+				msg.setPayloadText(query);
+			}
 
 			conn.send(msg);
 
-			//alert("SMS Sent", "The text message was sent.", _mainScreen, false);
-		}
-		catch (SecurityException e)
-		{
-			alert("SMS Error", "Access to SMS was refused: " + e.getMessage(), _mainScreen, true);
+			msg("SMS Sent", "The text message was sent.", mainScreen, false);
 		}
 		catch (Exception e)
 		{
-			alert("SMS Error", "The text message could not be sent: " + e.getMessage(), _mainScreen, true);
+			msg("SMS Error", "The text message could not be sent: " + e.getMessage(), mainScreen, true);
 		}
 		finally
 		{
diff --git a/src/net/thauvin/j2me/googlme/HelpScreen.java b/src/net/thauvin/j2me/googlme/HelpScreen.java
index 7175d15..69600b3 100755
--- a/src/net/thauvin/j2me/googlme/HelpScreen.java
+++ b/src/net/thauvin/j2me/googlme/HelpScreen.java
@@ -1,7 +1,7 @@
 /*
  * @(#)HelpScreen.java
  *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
+ * Copyright (c) 2004, Erik C. Thauvin (http://www.thauvin.net/erik/)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,16 +37,16 @@
 package net.thauvin.j2me.googlme;
 
 import javax.microedition.lcdui.Form;
-import javax.microedition.lcdui.StringItem;
 
 
 /**
  * The <code>HelpScreen</code> class implements a form used to display some help.
  *
- * @author  <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
+ * @author <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
  * @version $Revision$, $Date$
+ *
  * @created October 8, 2004
- * @since   1.0
+ * @since 1.0
  */
 public class HelpScreen extends Form
 {
@@ -57,24 +57,12 @@ public class HelpScreen extends Form
 	 */
 	public HelpScreen(GooglME midlet)
 	{
-		super(GooglME.APP_NAME + " Help");
+		super(midlet.appName + " Help");
 
-		append(new StringItem(GooglME.CHOICE_GOOGLE_SMS + ": ",
-							  "To get business listings, enter business name and city, state or zip. To get phone numbers, enter name of person and city, state or zip.\n\n"));
-		append(new StringItem(GooglME.CHOICE_GOOGLE_LOCAL + ": ",
-							  "To get local business listings, enter business name. To get local phone numbers, enter name of person. The permanent location setting is automatically added to your query.\n\n"));
-		append(new StringItem(GooglME.CHOICE_FROOGLE_PRICES + ": ", "For product prices, enter the product name.\n\n"));
-		append(new StringItem(GooglME.CHOICE_GOOGLE_SEARCH + ": ",
-							  "For Google search snippets, enter the search terms.\n\n"));
-		append(new StringItem(GooglME.CHOICE_MOVIE_SHOWTIMES + ": ",
-							  "To get movie showtimes, enter the movie's title followed by your location (a zip code or city and state). For a listing of theaters, enter 'theaters' followed by your location. For a listing of movies playing, enter 'movies' followed by your location.\n\n"));
-		append(new StringItem(GooglME.CHOICE_LOCAL_SHOWTIMES + ": ",
-							  "To get local movie showtimes, enter the movie's title. For a listing of theaters near you, enter 'theaters'. For a listing of movies playing near you, enter 'movies'. The permanent location setting is automatically added to your query.\n\n"));
-		append(new StringItem(GooglME.CHOICE_DEFINITION + ": ", "For definitions, enter the word or term.\n\n"));
-		append(new StringItem(GooglME.CHOICE_WEATHER + ": ",
-							  "To get the latest weather conditions and four-day forecast for a particular U.S. location, just enter your location, zip or city and state.\n\n"));
+		append("Google SMS: To get business listings, enter business name and city, state or zip. If you want to make sure you get Google Local results, put a period between the business name and the location. To get phone numbers, enter name of person and city, state or zip.\n\nFroogle Prices: For product prices, enter the product name.\n\nGoogle Search: For Google search snippets, enter the search terms.\n\nDefinition: For definitions, enter the word or term.");
 
-		addCommand(GooglME.COMMAND_BACK);
+		addCommand(midlet.exitCommand);
+		addCommand(midlet.backCommand);
 
 		setCommandListener(midlet);
 	}
diff --git a/src/net/thauvin/j2me/googlme/HistoryScreen.java b/src/net/thauvin/j2me/googlme/HistoryScreen.java
deleted file mode 100644
index 4f850e1..0000000
--- a/src/net/thauvin/j2me/googlme/HistoryScreen.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * @(#)HistoryScreen.java
- *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the authors nor the names of its contributors may be
- * used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
- *
- */
-package net.thauvin.j2me.googlme;
-
-import javax.microedition.lcdui.List;
-
-
-/**
- * The <code>HistoryScreen</code> class implements a form used to display the history.
- *
- * @author  Erik C. Thauvin
- * @version $Revision$, $Date$
- * @created Oct 12, 2004
- * @since   1.0
- */
-public class HistoryScreen extends List
-{
-	/**
-	 * Creates a new HistoryScreen object.
-	 *
-	 * @param midlet The MIDlet instance.
-	 */
-	public HistoryScreen(GooglME midlet)
-	{
-		super(GooglME.APP_NAME + " History", List.IMPLICIT);
-
-		addCommand(GooglME.COMMAND_BACK);
-
-		setCommandListener(midlet);
-	}
-}
diff --git a/src/net/thauvin/j2me/googlme/MainScreen.java b/src/net/thauvin/j2me/googlme/MainScreen.java
index aac8fa0..5a6e35e 100755
--- a/src/net/thauvin/j2me/googlme/MainScreen.java
+++ b/src/net/thauvin/j2me/googlme/MainScreen.java
@@ -1,7 +1,7 @@
 /*
  * @(#)MainScreen.java
  *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
+ * Copyright (c) 2004, Erik C. Thauvin (http://www.thauvin.net/erik/)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,10 +44,11 @@ import javax.microedition.lcdui.TextField;
 /**
  * The <code>MainScreen</code> class implements a form used to gather the data needed to perform a Google SMS query.
  *
- * @author  <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
+ * @author <a href="http://www.thauvin.net/erik/">Erik C. Thauvin</a>
  * @version $Revision$, $Date$
+ *
  * @created October 8, 2004
- * @since   1.0
+ * @since 1.0
  */
 public class MainScreen extends Form
 {
@@ -68,22 +69,21 @@ public class MainScreen extends Form
 	 */
 	public MainScreen(GooglME midlet)
 	{
-		super(GooglME.APP_NAME);
+		super(midlet.appName);
 
 		queryFld = new TextField("Query: ", "", 25, TextField.ANY);
 		Util.setInitialInputMode(queryFld, "MIDP_LOWERCASE_LATIN");
-		actionPopup = Util.getChoiceGroup("Type: ", GooglME.CHOICES);
+		actionPopup =
+			Util.getChoiceGroup("Type: ", new String[] { "Google SMS", "Froogle Prices", "Google Search", "Definition" });
 		actionPopup.setSelectedIndex(0, true);
 		append(queryFld);
 		append(actionPopup);
 
-		addCommand(GooglME.COMMAND_SEND);
-		addCommand(GooglME.COMMAND_CLEAR);
-		addCommand(GooglME.COMMAND_HISTORY);
-		addCommand(GooglME.COMMAND_SETTINGS);
-		addCommand(GooglME.COMMAND_HELP);
-		addCommand(GooglME.COMMAND_ABOUT);
-		addCommand(GooglME.COMMAND_EXIT);
+		addCommand(midlet.helpCommand);
+		addCommand(midlet.aboutCommand);
+		addCommand(midlet.clearCommand);
+		addCommand(midlet.exitCommand);
+		addCommand(midlet.sendCommand);
 
 		setCommandListener(midlet);
 	}
diff --git a/src/net/thauvin/j2me/googlme/PrefsScreen.java b/src/net/thauvin/j2me/googlme/PrefsScreen.java
deleted file mode 100644
index 4f13529..0000000
--- a/src/net/thauvin/j2me/googlme/PrefsScreen.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * @(#)PrefsScreen.java
- *
- * Copyright (c) 2004-2005, Erik C. Thauvin (http://www.thauvin.net/erik/)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the authors nor the names of its contributors may be
- * used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
- *
- */
-package net.thauvin.j2me.googlme;
-
-import javax.microedition.lcdui.Form;
-import javax.microedition.lcdui.StringItem;
-import javax.microedition.lcdui.TextField;
-
-
-/**
- * The <code>PrefsScreen</code> class implements a form used to set the preferences.
- *
- * @author  Erik C. Thauvin
- * @version $Revision$, $Date$
- * @created Oct 12, 2004
- * @since   1.0
- */
-public class PrefsScreen extends Form
-{
-	/**
-	 * The query field.
-	 */
-	protected /* final */ TextField locationFld;
-
-	/**
-	 * The SMS number field.
-	 */
-	protected /* final */ TextField smsFld;
-
-	/**
-	 * Creates a new PrefsScreen object.
-	 *
-	 * @param midlet The MIDlet instance.
-	 */
-	public PrefsScreen(GooglME midlet)
-	{
-		super(GooglME.APP_NAME + " Settings");
-
-		locationFld = new TextField("Location: ", "", 25, TextField.ANY);
-
-		append(locationFld);
-		append(new StringItem("", "Your current city and state or zip. (e.g.: san francisco ca or 94123)"));
-
-		smsFld = new TextField("Google SMS: ", "", 25, TextField.PHONENUMBER);
-
-		append(smsFld);
-		append(new StringItem("", "The short code or number of the Google SMS service. (e.g.: 46645)"));
-
-		addCommand(GooglME.COMMAND_BACK);
-		addCommand(GooglME.COMMAND_SAVE);
-
-		setCommandListener(midlet);
-	}
-}
diff --git a/src/net/thauvin/j2me/googlme/RmsIndex.java b/src/net/thauvin/j2me/googlme/RmsIndex.java
deleted file mode 100644
index 3467768..0000000
--- a/src/net/thauvin/j2me/googlme/RmsIndex.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/* Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The  above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-package net.thauvin.j2me.googlme;
-
-import javax.microedition.rms.*;
-import java.io.*;
-
-/**
- * An Rms based BTree index. Currently, the functionality is similar to a
- * persistent hashtable.
- */
-public class RmsIndex {
-
-    static byte[] DUMMY = new byte[0];
-
-    RecordStore store;
-
-    Node root;
-
-    int n = 32;
-
-    String cachedKey;
-
-    Node cachedNode;
-
-    int cachedIndex;
-
-    /** Node helper class */
-    class Node {
-        int index;
-
-        int size;
-
-        String[] keys = new String[n + n + 1];
-
-        String[] values = new String[n + n + 1];
-
-        int[] children = new int[n + n + 2];
-
-        /** Create a new Node */
-
-        Node() throws RecordStoreException {
-            index = store.addRecord(DUMMY, 0, 0);
-        }
-
-        Node(Node split) throws RecordStoreException {
-            this();
-            System.arraycopy(split.keys, n + 1, keys, 0, n);
-            System.arraycopy(split.values, n + 1, values, 0, n);
-            System.arraycopy(split.children, n + 1, children, 0, n + 1);
-            size = n;
-            split.size = n;
-            split.store();
-            store();
-        }
-
-        /** Load the node at the given index position */
-
-        Node(int index) throws RecordStoreException {
-            this.index = index;
-            byte[] data = store.getRecord(index);
-
-            if (data == null || data.length == 0)
-                return;
-
-            try {
-                DataInputStream dis = new DataInputStream(
-                        new ByteArrayInputStream(data));
-
-                size = dis.readInt();
-
-                for (int i = 0; i < size; i++) {
-                    children[i] = dis.readInt();
-                    keys[i] = dis.readUTF();
-                    values[i] = dis.readUTF();
-                }
-
-                children[size] = dis.readInt();
-            } catch (IOException e) {
-                throw new RuntimeException(e.toString());
-            }
-        }
-
-        public void put(String key, String value) throws RecordStoreException {
-
-            int i;
-            for (i = 0; i < size; i++) {
-                int cmp = key.compareTo(keys[i]);
-                if (cmp == 0) {
-                    values[i] = value;
-                    store();
-                    return;
-                } else if (cmp < 0)
-                    break;
-            }
-
-            int newIndex = 0;
-
-            if (children[i] != 0) {
-                Node child = new Node(children[i]);
-                child.put(key, value);
-
-                if (child.size < n + n + 1)
-                    return;
-
-                Node split = new Node(child);
-                newIndex = split.index;
-
-                key = child.keys[n];
-                value = child.values[n];
-            }
-
-            System.arraycopy(keys, i, keys, i + 1, size - i);
-            System.arraycopy(values, i, values, i + 1, size - i);
-            System.arraycopy(children, i + 1, children, i + 2, size - i);
-
-            keys[i] = key;
-            values[i] = value;
-            children[i + 1] = newIndex;
-            size++;
-
-            if (size < n + n + 1)
-                // otherwise, store will be performed by uplink
-                store();
-        }
-
-        public void store() throws RecordStoreException {
-
-            try {
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                DataOutputStream dos = new DataOutputStream(bos);
-                dos.writeInt(size);
-                for (int i = 0; i < size; i++) {
-                    dos.writeInt(children[i]);
-                    dos.writeUTF(keys[i]);
-                    dos.writeUTF(values[i]);
-                }
-                dos.writeInt(children[size]);
-                byte[] data = bos.toByteArray();
-                store.setRecord(index, data, 0, data.length);
-            } catch (IOException e) {
-                throw new RuntimeException(e.toString());
-            }
-        }
-    }
-
-    /**
-     * Creates a new index with the given Name
-     */
-    public RmsIndex(String name) throws RecordStoreException {
-
-        store = RecordStore.openRecordStore(name, true);
-        root = store.getNumRecords() == 0 ? new Node() : new Node(1);
-    }
-
-    /**
-     * Returns the value for the given key
-     *
-     * @param key: The key
-     * @return String: The value associated with the key, or null if none.
-     * @throws RecordStoreException
-     */
-    public String get(String key) throws RecordStoreException {
-
-        Node current = root;
-
-        while (true) {
-            int i;
-            for (i = 0; i < current.size; i++) {
-                int cmp = key.compareTo(current.keys[i]);
-                if (cmp == 0)
-                    return current.values[i];
-                else if (cmp < 0)
-                    break;
-            }
-            if (current.children[i] == 0)
-                return null;
-            current = new Node(current.children[i]);
-        }
-    }
-
-    /**
-     * Assigns the given value to the given key persistently
-     *
-     * @param key: The key
-     * @param value: The value
-     * @throws RecordStoreException
-     */
-    public void put(String key, String value) throws RecordStoreException {
-
-        root.put(key, value);
-        if (root.size < n + n + 1)
-            return;
-
-        // split root....
-
-        Node left = root;
-        root = new Node();
-
-        left.index = root.index;
-        root.index = 1;
-
-        Node right = new Node(left);
-
-        root.keys[0] = left.keys[n];
-        root.values[0] = left.values[n];
-        root.children[0] = left.index;
-        root.children[1] = right.index;
-        root.size = 1;
-        root.store();
-    }
-
-    public void close() throws RecordStoreException {
-        store.closeRecordStore();
-    }
-
-    public int size() throws RecordStoreException {
-
-        Node current = root;
-
-        return current.size;
-
-    }
-
-    public String get(int recordNum) throws RecordStoreException {
-
-        Node current = root;
-
-        return current.values[recordNum];
-
-    }
-
-    public String getKey(int recordNum) throws RecordStoreException {
-
-        Node current = root;
-
-        return current.keys[recordNum];
-
-    }
-
-    public void deleteAll(String name) throws RecordStoreException {
-
-        store.closeRecordStore();
-        RecordStore.deleteRecordStore(name);
-        store = RecordStore.openRecordStore(name, true);
-        root = store.getNumRecords() == 0 ? new Node() : new Node(1);
-
-    }
-
-}
\ No newline at end of file