diff --git a/Projects/Simba/extensionmanager.pas b/Projects/Simba/extensionmanager.pas
index 8727080..ad1d5eb 100644
--- a/Projects/Simba/extensionmanager.pas
+++ b/Projects/Simba/extensionmanager.pas
@@ -58,10 +58,15 @@ end;
 
 destructor TExtensionManager.Destroy;
 var
-  i: Integer;
+  I, C: Integer;
 begin
-  for i := 0 to Extensions.Count - 1 do
-    TExtension(Extensions.Items[i]).Free;
+  C := Extensions.Count - 1;
+  for I := 0 to C do
+  begin
+    TExtension(Extensions.Items[I]).Settings.Free;
+    TExtension(Extensions.Items[I]).Free;
+  end;
+
   Extensions.Free;
   inherited Destroy;
 end;
diff --git a/Projects/Simba/psextension.pas b/Projects/Simba/psextension.pas
index 47756e9..c100096 100644
--- a/Projects/Simba/psextension.pas
+++ b/Projects/Simba/psextension.pas
@@ -329,6 +329,7 @@ begin
   FreeScript;
   if Assigned(PSInstance) then
     FreeAndNil(PSInstance);
+  Script.Free;
   inherited;
 end;
 
diff --git a/TODO b/TODO
index 7217e55..052cefd 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,22 @@
--   Make Simba more ``modular'':
-    -   Fonts
-    -   Interpreters
-    -   Code completion/hints
-    -   Extensions
-    -   Interpreter system overhaul?
+Simple stuff, not required, may not be possible/useful:
+    -   Compiler arguments in the about form                        [ ]
+    -   Coloured writeln                                            [ ]
+    -   Make an TAction for the Colour Picker.                      [ ]
+    -   Portable install (needs fiddling with settings and such)    [ ]
+    -   --no-extensions flag for Simba.                             [ ]
+
+
+-   CTS rewrite to add CTS 3 and others.                            [ ]
+-   CTS/finder speedups.                                            [ ]
+
+-   New interpreters
+    -   DWSScript ?                                                 [ ]
+    -   Lape!                                                       [ ]
+
+-   Make Simba more ``modular'':
+    -   Fonts                                                       [ ]
+    -   Interpreters                                                [ ]
+    -   Code completion/hints                                       [ ]
+    -   Extensions                                                  [ ]
+    -   Interpreter system overhaul?                                [ ]
 
--   Make an TAction for the Colour Picker.
--   Portable install (needs fiddling with settings and such)
--   --no-extensions flag for Simba.