diff --git a/Projects/SAMufasaGUI/extensionmanager.pas b/Projects/SAMufasaGUI/extensionmanager.pas
index 5f3eeba..6729c77 100644
--- a/Projects/SAMufasaGUI/extensionmanager.pas
+++ b/Projects/SAMufasaGUI/extensionmanager.pas
@@ -1,6 +1,6 @@
 unit extensionmanager;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Projects/SAMufasaGUI/extensionmanagergui.pas b/Projects/SAMufasaGUI/extensionmanagergui.pas
index d3417ea..e74df2c 100644
--- a/Projects/SAMufasaGUI/extensionmanagergui.pas
+++ b/Projects/SAMufasaGUI/extensionmanagergui.pas
@@ -1,6 +1,6 @@
 unit extensionmanagergui;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Projects/SAMufasaGUI/psextension.pas b/Projects/SAMufasaGUI/psextension.pas
index 179bc7b..14fd367 100644
--- a/Projects/SAMufasaGUI/psextension.pas
+++ b/Projects/SAMufasaGUI/psextension.pas
@@ -1,6 +1,6 @@
 unit psextension;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
@@ -49,7 +49,7 @@ uses
   uPSC_extctrls,uPSC_menus, //Compile libs
   uPSR_std, uPSR_controls,uPSR_classes,uPSR_graphics,uPSR_stdctrls,uPSR_forms,
   uPSR_extctrls,uPSR_menus, //Runtime-libs
-  testunit,updateform,settingssandbox//Writeln
+  testunit,updateform,settingssandbox,bitmaps//Writeln
   ;
 
 function TSimbaPSExtension.HookExists(HookName: String): Boolean;
@@ -158,14 +158,14 @@ procedure TSimbaPSExtension.SIRegister_Settings(Cl: TPSPascalCompiler);
 begin
   with cl.AddClassN(nil,'TMMLSettingsSandbox') do
   begin;
-    RegisterMethod('function IsKey(KeyName: String): Boolean;');
-    RegisterMethod('function IsDirectory(KeyName: String): Boolean;');
-    RegisterMethod('function SetKeyValue(Keyname : string; Value : string) : boolean;');
-    RegisterMethod('function GetKeyValue(KeyName: String): String;');
-    RegisterMethod('function GetKeyValueDef(KeyName, defVal: String): String;');
-    RegisterMethod('function ListKeys(KeyName: String): TStringArray;');
-    RegisterMethod('function DeleteKey(KeyName: String): Boolean;');
-    RegisterMethod('function DeleteSubKeys(KeyName: String): Boolean;');
+    RegisterMethod('function IsKey(const KeyName: String): Boolean;');
+    RegisterMethod('function IsDirectory(const KeyName: String): Boolean;');
+    RegisterMethod('function SetKeyValue(const Keyname, Value : string) : boolean;');
+    RegisterMethod('function GetKeyValue(const KeyName: String): String;');
+    RegisterMethod('function GetKeyValueDef(const KeyName, defVal: String): String;');
+    RegisterMethod('function ListKeys(const KeyName: String; out Keys :TStringArray): boolean;');
+    RegisterMethod('function DeleteKey(const KeyName: String): Boolean;');
+    RegisterMethod('function DeleteSubKeys(const KeyName: String): Boolean;');
     RegisterProperty('Prefix','String',iptR);
   end;
 end;
diff --git a/Projects/SAMufasaGUI/simbasettings.pas b/Projects/SAMufasaGUI/simbasettings.pas
index 7ae34f9..2e20b0a 100644
--- a/Projects/SAMufasaGUI/simbasettings.pas
+++ b/Projects/SAMufasaGUI/simbasettings.pas
@@ -1,6 +1,6 @@
 unit simbasettings;
 
-{$mode objfpc} {$M+}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Projects/SAMufasaGUI/virtualextension.pas b/Projects/SAMufasaGUI/virtualextension.pas
index 90a5633..c53e42e 100644
--- a/Projects/SAMufasaGUI/virtualextension.pas
+++ b/Projects/SAMufasaGUI/virtualextension.pas
@@ -1,6 +1,6 @@
 unit virtualextension;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Units/MMLAddon/PSInc/Wrappers/settings.inc b/Units/MMLAddon/PSInc/Wrappers/settings.inc
index 7618cb7..d9781e0 100644
--- a/Units/MMLAddon/PSInc/Wrappers/settings.inc
+++ b/Units/MMLAddon/PSInc/Wrappers/settings.inc
@@ -21,6 +21,14 @@
     Settings.inc for the Mufasa Macro Library
 }
 
+function SetSettingValue(KeyName,value : string) : boolean;
+begin
+  if CurrThread.Sett <> nil then
+    result:= CurrThread.Sett.SetKeyValue(KeyName,Value)
+  else
+    result:=false;
+end;
+
 function KeyIsSetting(KeyName: String): Boolean;
 begin
   if CurrThread.Sett <> nil then
diff --git a/Units/MMLAddon/PSInc/psexportedmethods.inc b/Units/MMLAddon/PSInc/psexportedmethods.inc
index 6c2fa22..7d61c25 100644
--- a/Units/MMLAddon/PSInc/psexportedmethods.inc
+++ b/Units/MMLAddon/PSInc/psexportedmethods.inc
@@ -371,6 +371,7 @@ AddFunction(@KeyIsSetting, 'function KeyIsSetting(KeyName: String): Boolean;');
 AddFunction(@KeyIsDirectory, 'function KeyIsDirectory(KeyName: String): Boolean;');
 AddFunction(@GetSettingValue, 'function GetSettingValue(KeyName: String): String;');
 AddFunction(@GetSettingValueDef, 'function GetSettingValueDef(KeyName, defVal: String): String;');
+AddFunction(@SetSettingValue,'function SetSettingValue(KeyName,value : string) : boolean;');
 AddFunction(@ListSettings, 'function ListSettings(KeyName: String; var KeyReturn: TStringArray) : boolean;');
 AddFunction(@DeleteSetting, 'function DeleteSetting(KeyName: String): Boolean;');
 AddFunction(@DeleteSubSettings, 'function DeleteSubSettings(KeyName: String): Boolean;');
diff --git a/Units/MMLAddon/mmisc.pas b/Units/MMLAddon/mmisc.pas
index 6ce81a7..47c2014 100644
--- a/Units/MMLAddon/mmisc.pas
+++ b/Units/MMLAddon/mmisc.pas
@@ -1,6 +1,6 @@
 unit mmisc;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Units/MMLAddon/scriptproperties.pas b/Units/MMLAddon/scriptproperties.pas
index 9d4db35..848a5a8 100644
--- a/Units/MMLAddon/scriptproperties.pas
+++ b/Units/MMLAddon/scriptproperties.pas
@@ -1,6 +1,6 @@
 unit scriptproperties;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Units/MMLAddon/settingssandbox.pas b/Units/MMLAddon/settingssandbox.pas
index e2e0355..baff809 100644
--- a/Units/MMLAddon/settingssandbox.pas
+++ b/Units/MMLAddon/settingssandbox.pas
@@ -22,7 +22,7 @@
 }
 unit settingssandbox;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
@@ -42,15 +42,14 @@ type
   public
     constructor Create(sett: TMMLSettings);
     destructor Destroy; override;
-
-    function IsKey(KeyName: String): Boolean;
-    function IsDirectory(KeyName: String): Boolean;
-    function SetKeyValue(Keyname : string; Value : string) : boolean;
-    function GetKeyValue(KeyName: String): String;
-    function GetKeyValueDef(KeyName, defVal: String): String;
-    function ListKeys(KeyName: String; out Keys : TStringArray): boolean;
-    function DeleteKey(KeyName: String): Boolean;
-    function DeleteSubKeys(KeyName: String): Boolean;
+    function IsKey(const KeyName: String): Boolean;
+    function IsDirectory(const KeyName: String): Boolean;
+    function SetKeyValue(const Keyname, Value : string) : boolean;
+    function GetKeyValue(const KeyName: String): String;
+    function GetKeyValueDef(const KeyName, defVal: String): String;
+    function ListKeys(const KeyName: String; out Keys : TStringArray): boolean;
+    function DeleteKey(const KeyName: String): Boolean;
+    function DeleteSubKeys(const KeyName: String): Boolean;
     property prefix : string read GetPrefix write SetPrefix;
   end;
 
@@ -80,45 +79,43 @@ begin
   FPrefix := s;
 end;
 
-function TMMLSettingsSandbox.ListKeys(KeyName: String; out Keys :TStringArray): boolean;
+function TMMLSettingsSandbox.ListKeys(const KeyName: String; out Keys :TStringArray): boolean;
 begin
   exit(ST.ListKeys(Prefix + KeyName,keys))
 end;
 
-function TMMLSettingsSandbox.GetKeyValue(KeyName: String): String;
+function TMMLSettingsSandbox.GetKeyValue(const KeyName: String): String;
 begin
   exit(ST.GetKeyValue(Prefix + KeyName))
 end;
 
-function TMMLSettingsSandbox.GetKeyValueDef(KeyName, defVal: String): String;
+function TMMLSettingsSandbox.GetKeyValueDef(const KeyName, defVal: String): String;
 begin
   exit(ST.GetKeyValueDef(Prefix + KeyName, defVal))
 end;
 
-function TMMLSettingsSandbox.IsKey(KeyName: String): Boolean;
+function TMMLSettingsSandbox.IsKey(const KeyName: String): Boolean;
 begin
   exit(ST.IsKey(Prefix + KeyName))
 end;
 
-function TMMLSettingsSandbox.IsDirectory(KeyName: String): Boolean;
+function TMMLSettingsSandbox.IsDirectory(const KeyName: String): Boolean;
 begin
   exit(ST.IsDirectory(Prefix + KeyName))
 end;
 
-function TMMLSettingsSandbox.SetKeyValue(Keyname: string; Value: string
+function TMMLSettingsSandbox.SetKeyValue(const Keyname,Value: string
   ): boolean;
 begin
-  Writeln(KeyName);
-  Writeln(Value);
   exit(ST.SetKeyValue(prefix + keyname,value,true));
 end;
 
-function TMMLSettingsSandbox.DeleteKey(KeyName: String): Boolean;
+function TMMLSettingsSandbox.DeleteKey(const KeyName: String): Boolean;
 begin
   exit(ST.DeleteKey(Prefix + KeyName));
 end;
 
-function TMMLSettingsSandbox.DeleteSubKeys(KeyName: String): Boolean;
+function TMMLSettingsSandbox.DeleteSubKeys(const KeyName: String): Boolean;
 begin
   exit(ST.DeleteSubKeys(Prefix + KeyName));
 end;
diff --git a/Units/MMLAddon/stringutil.pas b/Units/MMLAddon/stringutil.pas
index 4a22a96..ae1d92e 100644
--- a/Units/MMLAddon/stringutil.pas
+++ b/Units/MMLAddon/stringutil.pas
@@ -1,6 +1,6 @@
 unit stringutil;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Units/MMLCore/client.pas b/Units/MMLCore/client.pas
index d478f3e..00ac269 100644
--- a/Units/MMLCore/client.pas
+++ b/Units/MMLCore/client.pas
@@ -60,13 +60,9 @@ implementation
 
 procedure TClient.WriteLn(s: string);
 begin
-  if self <> nil then
-  begin;
-    if Assigned(WritelnProc) then
-      WritelnProc(s)
-    else
-      mDebugLn(s);
-  end else
+  if (self <> nil) and Assigned(WritelnProc) then
+    WritelnProc(s)
+  else
     mDebugLn(s);
 end;
 
diff --git a/Units/MMLCore/dtm.pas b/Units/MMLCore/dtm.pas
index 7630a8a..0c15f02 100644
--- a/Units/MMLCore/dtm.pas
+++ b/Units/MMLCore/dtm.pas
@@ -32,46 +32,19 @@ uses
 
 type
     TMDTM = class(TObject)
-
-        private
-
-
-    public
-           function AddDTM(d: TDTM): Integer;
-           function AddpDTM(d: pDTM): Integer;
-           function GetDTM(index: Integer; out dtm: pDTM): Boolean;
-           procedure FreeDTM(DTM: Integer);
-           function StringToDTM(S: String): pDTM;
-           function SetDTMName(DTM: Integer; S: String): boolean;
-
-
-         {  function FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2,
-                           y2: Integer): Boolean;
-          function FindDTMs(DTM: Integer; out Points: TPointArray; x1, y1, x2,
-                            y2: Integer): Boolean;
-          function FindDTMRotated(DTM: Integer; out x, y: Integer; x1, y1, x2,
-                                  y2: Integer; sAngle, eAngle, aStep: Extended;
-                                  out aFound: Extended): Boolean;
-          function FindDTMsRotated(DTM: Integer; out Points: TPointArray; x1,
-                                  y1, x2, y2: Integer; sAngle, eAngle,
-                                  aStep: Extended; out aFound: T2DExtendedArray)
-                                  : Boolean;
-          function pFindDTM(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2:
-                           Integer): Boolean;
-          function pFindDTMRotated(DTM: pDTM; out x, y: Integer; x1, y1, x2,
-                                   y2: Integer; sAngle, eAngle, aStep: Extended;
-                                   out aFound: Extended): Boolean;
-          function pFindDTMsRotated(DTM: pDTM; out Points: TPointArray; x1,
-                                    y1, x2, y2: Integer; sAngle, eAngle,
-                                    aStep: Extended; out aFound: T2DExtendedArray)
-                                    : Boolean;
-                                                    }
-           constructor Create(Owner: TObject);
-           destructor Destroy; override;
     private
-           Client: TObject;
-           DTMList: Array Of pDTM;
-           FreeSpots: Array Of Integer;
+      Client: TObject;
+      DTMList: Array Of pDTM;
+      FreeSpots: Array Of Integer;
+    public
+      function AddDTM(const d: TDTM): Integer;
+      function AddpDTM(const d: pDTM): Integer;
+      function GetDTM(index: Integer; out dtm: pDTM): Boolean;
+      procedure FreeDTM(DTM: Integer);
+      function StringToDTM(const S: String): pDTM;
+      function SetDTMName(DTM: Integer;const S: String): boolean;
+      constructor Create(Owner: TObject);
+      destructor Destroy; override;
     end;
 
 implementation
@@ -125,27 +98,20 @@ begin
   inherited Destroy;
 end;
 
-{Function AreaShape(Color, Tolerance, Size, Shape: Integer; P: TPoint) : Boolean; inline;
-
-Begin
-
-End;}
-
 //  Rotates the given point (p) by A (in radians) around the point defined by cx, cy.
 
-function RotatePoint(p: TPoint; angle, mx, my: Extended): TPoint; inline;
-
+function RotatePoint(const p: TPoint;const angle, mx, my: Extended): TPoint; inline;
 begin
   Result.X := Round(mx + cos(angle) * (p.x - mx) - sin(angle) * (p.y - my));
   Result.Y := Round(my + sin(angle) * (p.x - mx) + cos(angle) * (p.y- my));
 end;
 
-function HexToInt(HexNum: string): LongInt;inline;
+function HexToInt(const HexNum: string): LongInt;inline;
 begin
    Result:=StrToInt('$' + HexNum);
 end;
 
-function TMDTM.StringToDTM(S: String): pDTM;
+function TMDTM.StringToDTM(const S: String): pDTM;
 var
   b: PBufferByteArray;
   Source : String;
@@ -192,7 +158,7 @@ begin
   result.l := length(result.p);
 end;
 
-function TMDTM.AddDTM(d: TDTM): Integer;
+function TMDTM.AddDTM(const d: TDTM): Integer;
 
 begin
   if Length(FreeSpots) > 0 then
@@ -213,7 +179,7 @@ end;
   Adds the given pDTM to the DTM Array, and returns it's index.
 /\}
 
-function TMDTM.AddpDTM(d: pDTM): Integer;
+function TMDTM.AddpDTM(const d: pDTM): Integer;
 
 begin
   if Length(FreeSpots) > 0 then
@@ -250,7 +216,7 @@ begin
   end
 end;
 
-function TMDTM.SetDTMName(DTM: Integer; s: string): boolean;
+function TMDTM.SetDTMName(DTM: Integer;const s: string): boolean;
 begin
   try
     DTMList[DTM].n:= s;
@@ -284,62 +250,6 @@ begin
   FreeSpots[High(FreeSpots)] := DTM;
 end;
 
-
-{
-  Tries to find the given DTM (index). If found will put the point the dtm has
-  been found at in x, y and result to true.
-}
-{function TMDTM.FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
-var
-   temp: pDTM;
-begin
-  if GetDTM(DTM, temp) then
-    Result := pFindDTM(temp, x, y, x1, y1, x2, y2)
-  else
-  begin
-    x := 0;
-    y := 0;
-    Result := False;
-  end;
-end;  }
-
-{
-  Tries to find the given pDTM. If found will put the point the dtm has
-  been found at in x, y and result to true.
-}
-
-{function TMDTM.pFindDTM(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
-
-
-begin
-
-end;   }
-
-{/\
-  Tries to find the given DTM (index). Will return true if it has found one or more
-  DTM's. All the occurances are stored in the Points (TPointArray)
-/\}
-
-{function TMDTM.FindDTMs(DTM: Integer; out Points: TPointArray; x1, y1, x2, y2: Integer): Boolean;
-Var
-   temp: pDTM;
-Begin
-  If GetDTM(DTM, temp) Then
-    Result := pFindDTMs(temp, Points, x1, y1, x2, y2)
-  Else
-  Begin
-    SetLength(Points, 0);
-    Result := False;
-  End;
-End;     }
-
-{/\
-  Tries to find the given pDTM. Will return true if it has found one or more
-  DTM's. All the occurances are stored in the Points (TPointArray)
-/\}
-
-
-
 {wat}
 // Then, first find all occurances of all colours on the given client.
 // Each point has a colour, and we call them C_0...C_n.
@@ -427,12 +337,5 @@ End;    }
   Returns all Angles in a Two Dimensional Extended array.
 /\}
 
-{Function TMDTM.pFindDTMsRotated(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray): Boolean;
-
-Begin
-  // Don't forget to pre calculate the rotated points at the start.
-  // Saves a lot of rotatepoint() calls.
-End;  }
-
 end.
 
diff --git a/Units/MMLCore/dtmutil.pas b/Units/MMLCore/dtmutil.pas
index 11cb4e4..6e6b990 100644
--- a/Units/MMLCore/dtmutil.pas
+++ b/Units/MMLCore/dtmutil.pas
@@ -33,13 +33,13 @@ uses
 
 Function pDTMToTDTM(Const DTM: pDTM): TDTM;
 Function tDTMTopDTM(Const DTM: TDTM): pDTM;
-Procedure PrintpDTM(aDTM : pDTM);
+Procedure PrintpDTM(const aDTM : pDTM);
 
 procedure initdtm(out d: pdtm; len: integer);
 function ValidMainPointBox(var dtm: pDTM; const x1, y1, x2, y2: Integer): TBox;
-Function ValidMainPointBoxRotated(var dtm: pDTM; const x1, y1, x2, y2: Integer;
+Function ValidMainPointBoxRotated(var dtm: pDTM; const x1, y1, x2, y2: Integer;const
                                   sAngle, eAngle, aStep: Extended): TBox;
-function DTMConsistent(var dtm: pdtm): boolean;
+function DTMConsistent(const dtm: pdtm): boolean;
 procedure NormalizeDTM(var dtm: pdtm);
 function RotateDTM(const dtm: pdtm; angle: extended) : pdtm;
 function copydtm(const dtm: pdtm): pdtm;
@@ -99,7 +99,7 @@ begin
     d.bp[i] := False;
 end;
 
-Procedure PrintpDTM(aDTM : pDTM);
+Procedure PrintpDTM(const aDTM : pDTM);
 var
   i : integer;
 begin;
@@ -185,7 +185,7 @@ Begin
 End;
 
 { TODO: Check if bounds are correct? }
-function DTMConsistent(var dtm: pdtm): boolean;
+function DTMConsistent(const dtm: pdtm): boolean;
 var
    i: integer;
 begin
@@ -257,7 +257,7 @@ begin
 end;
 
 Function ValidMainPointBoxRotated(var dtm: pDTM; const x1, y1, x2, y2: Integer;
-                                  sAngle, eAngle, aStep: Extended): TBox;
+                                  const sAngle, eAngle, aStep: Extended): TBox;
 
 var
    i: Integer;
diff --git a/Units/MMLCore/finder.pas b/Units/MMLCore/finder.pas
index 31ecc33..c0e5bdd 100644
--- a/Units/MMLCore/finder.pas
+++ b/Units/MMLCore/finder.pas
@@ -30,7 +30,7 @@ interface
 
 {$define CheckAllBackground}//Undefine this to only check the first white point against the background (in masks).
 uses
-  Classes, SysUtils,bitmaps,MufasaBase,  MufasaTypes; // Types
+  colour_conv, Classes, SysUtils,bitmaps,MufasaBase,  MufasaTypes; // Types
 
 { TMFinder Class }
 
@@ -42,69 +42,66 @@ uses
 }
 
 type
-    TMFinder = class(TObject)
-          constructor Create(aClient: TObject);
-          destructor Destroy; override;
-      private
+  TMFinder = class(TObject)
+  private
+    Client: TObject;
+    Percentage : array[0..255] of Extended; //We store all the possible RGB / 255 divisions.
+    CachedWidth, CachedHeight : integer;
+    ClientTPA : TPointArray;
+    hueMod, satMod: Extended;
+    CTS: Integer;
 
+    Procedure UpdateCachedValues(NewWidth,NewHeight : integer);
+    procedure DefaultOperations(var xs,ys,xe,ye : integer);
+    //Loads the Spiral into ClientTPA (Will not cause problems)
+    procedure LoadSpiralPath(startX, startY, x1, y1, x2, y2: Integer);
+  public
+    WarnOnly : boolean;
+    function FindColorsToleranceOptimised(out Points: TPointArray; Color,xs, ys, xe, ye, Tol: Integer): Boolean;
+    function FindColorToleranceOptimised(out x, y: Integer; Color, xs, ys,xe, ye, tol: Integer): Boolean;
+    function CountColorTolerance(Color, xs, ys, xe, ye, Tolerance: Integer): Integer;
+    function CountColor(Color, xs, ys, xe, ye: Integer): Integer;
+    function SimilarColors(Color1,Color2,Tolerance : Integer) : boolean;
+    // Possibly turn x, y into a TPoint var.
+    function FindColor(out x, y: Integer; Color, xs, ys, xe, ye: Integer): Boolean;
+    function FindColorSpiral(var x, y: Integer; color, xs, ys, xe, ye: Integer): Boolean;
+    function FindColorSpiralTolerance(var x, y: Integer; color, xs, ys, xe, ye,Tol: Integer): Boolean;
+    function FindColorTolerance(out x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
+    function FindColorsTolerance(out Points: TPointArray; Color, xs, ys, xe, ye, Tol: Integer): Boolean;
+    function FindColorsSpiralTolerance(x, y: Integer; out Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
+    function FindColors(out TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
+    function FindColoredArea(var x, y: Integer; color, xs, ys, xe, ye: Integer; MinArea: Integer): Boolean;
+    function FindColoredAreaTolerance(var x, y: Integer; color, xs, ys, xe, ye: Integer; MinArea, tol: Integer): Boolean;
+    //Mask
+    function FindMaskTolerance(const mask: TMask; out x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
+    procedure CheckMask(const Mask : TMask);
+    //Bitmap functions
+    function FindBitmap(bitmap: TMufasaBitmap; out x, y: Integer): Boolean;
+    function FindBitmapIn(bitmap: TMufasaBitmap; out x, y: Integer;  xs, ys, xe, ye: Integer): Boolean;
+    function FindBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;
+    function FindBitmapSpiral(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
+    function FindBitmapSpiralTolerance(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye,tolerance : integer): Boolean;
+    function FindBitmapsSpiralTolerance(bitmap: TMufasaBitmap; x, y: Integer; out Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
+    function FindDeformedBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer; AllowPartialAccuracy: Boolean; out accuracy: Extended): Boolean;
 
-        Procedure UpdateCachedValues(NewWidth,NewHeight : integer);
-        procedure DefaultOperations(var xs,ys,xe,ye : integer);
-        //Loads the Spiral into ClientTPA (Will not cause problems)
-        procedure LoadSpiralPath(startX, startY, x1, y1, x2, y2: Integer);
-      public
-        function FindColorsToleranceOptimised(out Points: TPointArray; Color,
-          xs, ys, xe, ye, Tol: Integer): Boolean;
-        function FindColorToleranceOptimised(out x, y: Integer; Color, xs, ys,
-          xe, ye, tol: Integer): Boolean;
-        function CountColorTolerance(Color, xs, ys, xe, ye, Tolerance: Integer): Integer;
-        function CountColor(Color, xs, ys, xe, ye: Integer): Integer;
-        function SimilarColors(Color1,Color2,Tolerance : Integer) : boolean;
-        // Possibly turn x, y into a TPoint var.
-        function FindColor(out x, y: Integer; Color, xs, ys, xe, ye: Integer): Boolean;
-        function FindColorSpiral(var x, y: Integer; color, xs, ys, xe, ye: Integer): Boolean;
-        function FindColorSpiralTolerance(var x, y: Integer; color, xs, ys, xe, ye,Tol: Integer): Boolean;
-        function FindColorTolerance(out x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
-        function FindColorsTolerance(out Points: TPointArray; Color, xs, ys, xe, ye, Tol: Integer): Boolean;
-        function FindColorsSpiralTolerance(x, y: Integer; out Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
-        function FindColors(out TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
-        function FindColoredArea(var x, y: Integer; color, xs, ys, xe, ye: Integer; MinArea: Integer): Boolean;
-        function FindColoredAreaTolerance(var x, y: Integer; color, xs, ys, xe, ye: Integer; MinArea, tol: Integer): Boolean;
-        //Mask
-        function FindMaskTolerance(mask: TMask; out x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
-        procedure CheckMask(Mask : TMask);
-        //Bitmap functions
-        function FindBitmap(bitmap: TMufasaBitmap; out x, y: Integer): Boolean;
-        function FindBitmapIn(bitmap: TMufasaBitmap; out x, y: Integer;  xs, ys, xe, ye: Integer): Boolean;
-        function FindBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;
-        function FindBitmapSpiral(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
-        function FindBitmapSpiralTolerance(bitmap: TMufasaBitmap; var x, y: Integer; xs, ys, xe, ye,tolerance : integer): Boolean;
-        function FindBitmapsSpiralTolerance(bitmap: TMufasaBitmap; x, y: Integer; out Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
-        function FindDeformedBitmapToleranceIn(bitmap: TMufasaBitmap; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer; AllowPartialAccuracy: Boolean; out accuracy: Extended): Boolean;
-
-        function FindDTM(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
-        function FindDTMs(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2, maxToFind: Integer): Boolean;
-        function FindDTMRotated(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended; Alternating : boolean): Boolean;
-        function FindDTMsRotated(_DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray; maxToFind: Integer; Alternating : boolean): Boolean;
-        //Donno
-        function GetColors(Coords: TPointArray): TIntegerArray;
-        // tol speeds
-        procedure SetToleranceSpeed(nCTS: Integer);
-        function GetToleranceSpeed: Integer;
-        procedure SetToleranceSpeed2Modifiers(nHue, nSat: Extended);
-        procedure GetToleranceSpeed2Modifiers(out hMod, sMod: Extended);
-    protected
-        Client: TObject;
-        Percentage : array[0..255] of Extended; //We store all the possible RGB / 255 divisions.
-        CachedWidth, CachedHeight : integer;
-        ClientTPA : TPointArray;
-        hueMod, satMod: Extended;
-        CTS: Integer;
-    end;
+    function FindDTM(const DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
+    function FindDTMs(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2, maxToFind: Integer): Boolean;
+    function FindDTMRotated(const DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended; Alternating : boolean): Boolean;
+    function FindDTMsRotated(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray; maxToFind: Integer; Alternating : boolean): Boolean;
+    //Donno
+    function GetColors(const Coords: TPointArray): TIntegerArray;
+    // tol speeds
+    procedure SetToleranceSpeed(nCTS: Integer);
+    function GetToleranceSpeed: Integer;
+    procedure SetToleranceSpeed2Modifiers(const nHue, nSat: Extended);
+    procedure GetToleranceSpeed2Modifiers(out hMod, sMod: Extended);
+    constructor Create(aClient: TObject);
+    destructor Destroy; override;
+  end;
 
 implementation
 uses
-    colour_conv,// For RGBToColor, etc.
+//    colour_conv,// For RGBToColor, etc.
     Client, // For the Client Casts.
     math, //min/max
     tpa, //TPABounds
@@ -254,6 +251,7 @@ var
 begin
   inherited Create;
 
+  WarnOnly := False;
   Self.Client := aClient;
   Self.CTS := 1;
   Self.hueMod := 0.2;
@@ -281,7 +279,7 @@ begin
   Result := Self.CTS;
 end;
 
-procedure TMFinder.SetToleranceSpeed2Modifiers(nHue, nSat: Extended);
+procedure TMFinder.SetToleranceSpeed2Modifiers(const nHue, nSat: Extended);
 begin
   Self.hueMod := nHue;
   Self.satMod := nSat;
@@ -338,34 +336,64 @@ begin
   SetLength(ClientTPA,NewWidth * NewHeight);
 end;
 
+procedure Swap(var A,B : integer);
+var
+  c : integer;
+begin
+  c := a;
+  a := b;
+  b := c;
+end;
+
 procedure TMFinder.DefaultOperations(var xs, ys, xe, ye: integer);
 var
   w,h : integer;
 begin
-  if xs > xe then
-    raise Exception.CreateFMT('Finder function: Xs > xe (%d,%d)',[xs,xe]);
+  if (xs > xe) then
+    if WarnOnly then
+    begin
+      TClient(Client).WriteLn(Format('Warning! You passed wrong values to a finder function: xs > xe (%d,%d). Swapping the values for now.',[xs,xe]));
+      swap(xs,xe);
+    end else
+      raise Exception.CreateFMT('You passed wrong values to a finder function: xs > xe (%d,%d).',[xs,xe]);
   if ys > ye then
-    raise Exception.CreateFMT('Finder function: Ys > ye (%d,%d)',[ys,ye]);
+    if WarnOnly then
+    begin
+      TClient(Client).WriteLn(Format('Warning! You passed wrong values to a finder function: ys > ye (%d,%d). Swapping the values for now.',[ys,ye]));
+      swap(ys,ye);
+    end else
+      raise Exception.CreateFMT('You passed wrong values to a finder function: ys > ye (%d,%d).',[ys,ye]);
   if xs < 0 then
-    // xs := 0;
-    raise Exception.createFMT('Any Find Function, you did not pass a ' +
-                              'correct xs: %d.', [xs]);
+    if WarnOnly then
+    begin
+      TClient(Client).WriteLn(Format('Warning! You passed a wrong xs to a finder function: %d. That is below 0, thus out of bounds. Setting the value to 0 for now.',[xs]));
+      xs := 0;
+    end else
+      raise Exception.createFMT('You passed a wrong xs to a finder function: %d. That is below 0, thus out of bounds.',[xs]);
   if ys < 0 then
-//    ys := 0;
-    raise Exception.createFMT('Any Find Function, you did not pass a ' +
-                              'correct ys: %d.', [ys]);
-
+    if WarnOnly then
+    begin
+      TClient(Client).WriteLn(Format('Warning! You passed a wrong ys to a finder function: %d. That is below 0, thus out of bounds. Setting the value to 0 for now.',[ys]));
+      ys := 0;
+    end else
+      raise Exception.createFMT('You passed a wrong ys to a finder function: %d. That is below 0, thus out of bounds.',[ys]);
   TClient(Self.Client).IOManager.GetDimensions(w,h);
   if (w <> CachedWidth) or (h <> CachedHeight) then
     UpdateCachedValues(w,h);
   if xe >= w then
-//    xe := w-1;
-    raise Exception.createFMT('Any Find Function, you did not pass a ' +
-                              'correct xe: %d.', [xe]);
+    if WarnOnly then
+    begin
+      TClient(Client).WriteLn(Format('Warning! You passed a wrong xe to a finder function: %d. The client has a width of %d, thus the xe is out of bounds. Setting the value to %d (w-1) for now.',[xe,w,w-1]));
+      xe := w-1;
+    end else
+      raise Exception.createFMT('You passed a wrong xe to a finder function: %d. The client has a width of %d, thus the xe is out of bounds.',[xe,w]);
   if ye >= h then
-//    ye := h-1;
-    raise Exception.createFMT('Any Find Function, you did not pass a ' +
-                              'correct ye: %d.', [ye]);
+    if WarnOnly then
+    begin
+      TClient(Client).WriteLn(Format('Warning! You passed a wrong ye to a finder function: %d. The client has a height of %d, thus the ye is out of bounds. Setting the value to %d (h-1) for now.',[ye,h,h-1]));
+      ye := h-1;
+    end else
+      raise Exception.createFMT('You passed a wrong ye to a finder function: %d. The client has a height of %d, thus the ye is out of bounds.',[ye,h]);
 end;
 
 function TMFinder.CountColorTolerance(Color, xs, ys, xe, ye, Tolerance: Integer): Integer;
@@ -1181,6 +1209,7 @@ begin
           //Finally lets test H2
           if Abs(H2 - H1) > HueTol then
             continue;
+          //We survived the checks, this point is a match!
           hit:
             ClientTPA[c].x := xx;
             ClientTPA[c].y := yy;
@@ -1323,7 +1352,7 @@ end;
  { Only works with CTS 1 for now.. Since Colorsame doesn't return a boolean :-( }
 //We do not check whether every white pixel is in tol range with every other white pixel..
 
-function TMFinder.FindMaskTolerance(mask: TMask; out x, y: Integer; xs,
+function TMFinder.FindMaskTolerance(const mask: TMask; out x, y: Integer; xs,
   ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
 var
    MainRowdata : TPRGB32Array;
@@ -1400,7 +1429,7 @@ begin
   TClient(Client).IOManager.FreeReturnData;
 end;
 
-procedure TMFinder.CheckMask(Mask: TMask);
+procedure TMFinder.CheckMask(const Mask: TMask);
 begin
   if (Mask.W < 1) or (Mask.H < 1) or (Mask.WhiteHi < 0) or (Mask.BlackHi < 0) then
     raise exception.CreateFMT('Mask is invalid. Width/Height: (%d,%d). WhiteHi/BlackHi: (%d,%d)',[Mask.W,Mask.H,Mask.WhiteHi,Mask.BlackHi]);
@@ -1875,8 +1904,12 @@ begin
   end;
 end;
 
-function TMFinder.FindDTM(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
+{
+  Tries to find the given DTM. If found will put the point the dtm has
+  been found at in x, y and result to true.
+}
 
+function TMFinder.FindDTM(const DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
 var
    P: TPointArray;
 begin
@@ -2048,7 +2081,7 @@ begin
   Result := (pc > 0);
 end;
 
-function TMFinder.FindDTMRotated(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended; Alternating : boolean): Boolean;
+function TMFinder.FindDTMRotated(const DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended; Alternating : boolean): Boolean;
 
 var
    P: TPointArray;
@@ -2063,9 +2096,9 @@ begin
   Exit(True);
 end;
 
-function TMFinder.FindDTMsRotated(_DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray; maxToFind: Integer; Alternating : boolean): Boolean;
+function TMFinder.FindDTMsRotated(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray; maxToFind: Integer; Alternating : boolean): Boolean;
 var
-   DTM: pDTM;
+   DTMRot: pDTM;
    // Colours of DTMs
    clR,clG,clB : array of byte;
 
@@ -2113,17 +2146,17 @@ var
 begin
   // Is the area valid?
   DefaultOperations(x1, y1, x2, y2);
-  if not DTMConsistent(_dtm) then
+  if not DTMConsistent(DTM) then
   begin
-    raise Exception.CreateFmt('FindDTMsRotated: DTM is not consistent.', []);
+    raise Exception.CreateFmt('FindDTMsRotated: DTMRot is not consistent.', []);
     Exit;
   end;
 
-  NormalizeDTM(_dtm);
+  NormalizeDTM(DTM);
 
-  setlength(goodPoints, _dtm.l);
-  for i := 0 to _dtm.l - 1 do
-    goodPoints[i] := not _dtm.bp[i];
+  setlength(goodPoints, DTM.l);
+  for i := 0 to DTM.l - 1 do
+    goodPoints[i] := not DTM.bp[i];
 
   // Init data structure B.
   W := x2 - x1;
@@ -2139,18 +2172,18 @@ begin
   end;
 
   // Convert colors to there components
-  SetLength(clR,_dtm.l);
-  SetLength(clG,_dtm.l);
-  SetLength(clB,_dtm.l);
-  for i := 0 to _dtm.l - 1 do
-    ColorToRGB(_dtm.c[i],clR[i],clG[i],clB[i]);
+  SetLength(clR,DTM.l);
+  SetLength(clG,DTM.l);
+  SetLength(clB,DTM.l);
+  for i := 0 to DTM.l - 1 do
+    ColorToRGB(DTM.c[i],clR[i],clG[i],clB[i]);
   //Compiler hints
 
-  SetLength(hh,_dtm.l);
-  SetLength(ss,_dtm.l);
-  SetLength(ll,_dtm.l);
-  for i := 0 to _DTM.l - 1 do
-    ColorToHSL(_dtm.c[i],hh[i],ss[i],ll[i]);
+  SetLength(hh,DTM.l);
+  SetLength(ss,DTM.l);
+  SetLength(ll,DTM.l);
+  for i := 0 to DTM.l - 1 do
+    ColorToHSL(DTM.c[i],hh[i],ss[i],ll[i]);
 
   GetToleranceSpeed2Modifiers(hMod, sMod);
   ccts := CTS;
@@ -2170,9 +2203,9 @@ begin
     s := sAngle;
   while s < eAngle do
   begin
-    dtm := RotateDTM(_dtm, s);
-    //Rotate the DTM, the rest is just like FindDTMs
-    MA := ValidMainPointBox(DTM, x1, y1, x2, y2);
+    DTMRot := RotateDTM(DTM, s);
+    //Rotate the DTMRot, the rest is just like FindDTMs
+    MA := ValidMainPointBox(DTMRot, x1, y1, x2, y2);
     //CD starts at 0,0.. We must adjust the MA, since this is still based on the xs,ys,xe,ye box.
     MA.x1 := MA.x1 - x1;
     MA.y1 := MA.y1 - y1;
@@ -2183,14 +2216,14 @@ begin
       for xx := MA.x1  to MA.x2 do
       begin
         //Mainpoint can have area size as well, so we must check that just like any subpoint.
-        for i := 0 to dtm.l - 1 do
+        for i := 0 to DTMRot.l - 1 do
         begin //change to use other areashapes too.
           Found := false;
           //With area it can go out of bounds, therefore this max/min check
-          StartX := max(0,xx - dtm.asz[i] + dtm.p[i].x);
-          StartY := max(0,yy - dtm.asz[i] + dtm.p[i].y);
-          EndX := Min(Ma.x2,xx + dtm.asz[i] + dtm.p[i].x);
-          EndY := Min(ma.y2,yy + dtm.asz[i] + dtm.p[i].y);
+          StartX := max(0,xx - DTMRot.asz[i] + DTMRot.p[i].x);
+          StartY := max(0,yy - DTMRot.asz[i] + DTMRot.p[i].y);
+          EndX := Min(Ma.x2,xx + DTMRot.asz[i] + DTMRot.p[i].x);
+          EndY := Min(ma.y2,yy + DTMRot.asz[i] + DTMRot.p[i].y);
           for xxx := StartX to EndX do //The search area for the subpoint
           begin
             for yyy := StartY to EndY do
@@ -2201,7 +2234,7 @@ begin
                 // Checking point i now. (Store that we matched it)
                 ch[xxx][yyy]:= ch[xxx][yyy] or (1 shl i);
 
-                if ColorSame(ccts,dtm.t[i],clR[i],clG[i],clB[i],cd[yyy][xxx].R, cd[yyy][xxx].G, cd[yyy][xxx].B,hh[i],ss[i],ll[i],hmod,smod) then
+                if ColorSame(ccts,DTMRot.t[i],clR[i],clG[i],clB[i],cd[yyy][xxx].R, cd[yyy][xxx].G, cd[yyy][xxx].B,hh[i],ss[i],ll[i],hmod,smod) then
                   b[xxx][yyy] := b[xxx][yyy] or (1 shl i);
               end;
 
@@ -2252,7 +2285,7 @@ begin
 //  raise Exception.CreateFmt('Not done yet!', []);
 end;
 
-function TMFinder.GetColors(Coords: TPointArray): TIntegerArray;
+function TMFinder.GetColors(const Coords: TPointArray): TIntegerArray;
 var
   Box : TBox;
   Len, I,w,h : integer;
diff --git a/Units/MMLCore/libloader.pas b/Units/MMLCore/libloader.pas
index e8e15e3..1220a5f 100644
--- a/Units/MMLCore/libloader.pas
+++ b/Units/MMLCore/libloader.pas
@@ -1,6 +1,6 @@
 unit libloader;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 
diff --git a/Units/MMLCore/mufasabase.pas b/Units/MMLCore/mufasabase.pas
index b74d29f..a7a7bce 100644
--- a/Units/MMLCore/mufasabase.pas
+++ b/Units/MMLCore/mufasabase.pas
@@ -1,6 +1,6 @@
 unit mufasabase;
 
-{$mode objfpc}
+{$mode objfpc}{$H+}
 
 interface
 {$undefine mDebug}