diff --git a/2.10/Source/Editor.dfm b/2.10/Source/Editor.dfm
index f60a1aa..9e2cc1f 100644
--- a/2.10/Source/Editor.dfm
+++ b/2.10/Source/Editor.dfm
@@ -1660,7 +1660,7 @@ object EditForm: TEditForm
     object mnuExtendedEdit: TMenuItem
       Caption = 'Extended edit mode'
       Hint = 'Toggle extended edit mode'
-      ImageIndex = 24
+      ImageIndex = 25
       OnClick = tbExtendedEditClick
     end
     object mnuAxisLock: TMenuItem
diff --git a/2.10/Source/ImageMaker.pas b/2.10/Source/ImageMaker.pas
index 1e69c48..7d5522d 100644
--- a/2.10/Source/ImageMaker.pas
+++ b/2.10/Source/ImageMaker.pas
@@ -21,6 +21,8 @@ type
     FBuckets: TBucketArray;
     FOnProgress: TOnProgress;
 
+    MaxA: int64; // for reuse in following slices
+
     procedure CreateFilter;
     procedure NormalizeFilter;
     procedure SetOnProgress(const Value: TOnProgress);
@@ -49,6 +51,7 @@ type
     property OnProgress: TOnProgress
         read FOnProgress
        write SetOnProgress;
+    property MaxCount: int64 read MaxA;
   end;
 
 implementation
@@ -366,10 +369,6 @@ begin
   Progress(1);
 end;
 
-// global variable for reuse in follong slices
-var
-  MaxA: int64;
-
 ///////////////////////////////////////////////////////////////////////////////
 // michael baranov transparancy code from flamesong
 procedure TImageMaker.CreateImage_MB(YOffset: integer);
diff --git a/2.10/Source/Options.dfm b/2.10/Source/Options.dfm
index c68d849..887ee6c 100644
--- a/2.10/Source/Options.dfm
+++ b/2.10/Source/Options.dfm
@@ -44,7 +44,7 @@ object OptionsForm: TOptionsForm
     Top = 8
     Width = 451
     Height = 265
-    ActivePage = RandomPage
+    ActivePage = GeneralPage
     TabOrder = 0
     TabStop = False
     object GeneralPage: TTabSheet
diff --git a/2.10/Source/ScriptForm.dfm b/2.10/Source/ScriptForm.dfm
index fb327cc..35d0b00 100644
--- a/2.10/Source/ScriptForm.dfm
+++ b/2.10/Source/ScriptForm.dfm
@@ -135,8 +135,6 @@ object ScriptEditor: TScriptEditor
       BlockLineColor = clGray
       BkColor = clWindow
       BorderStyle = bsNone
-      CodeFolding.Enabled = False
-      CodeFolding.LineColor = clGray
       Ctl3D = False
       DelErase = True
       EnhancedHomeKey = False