From 4b494d82fb251abf19d2e8edeadf505c8dd8dad6 Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:13:20 +0000
Subject: [PATCH] Fix typos

Found via `codespell -q 3 -S "./lightcrafts/locale,./lightcrafts/help" -L bu,ist,ois,padd`

Commit includes some whitespace formatting fixes as well.
---
 lightcrafts/coprocesses/dcraw/dcraw_lz.c      |   6 +-
 .../dcraw/patches/xtrans_yama1968.patch       |   2 +-
 lightcrafts/help/Danish/Regions-Creating.html |   2 +-
 lightcrafts/help/Dutch/Regions-Creating.html  |   2 +-
 .../help/English/Regions-Creating.html        |   2 +-
 .../help/Spanish/Regions-Creating.html        |   2 +-
 .../jnisrc/EDISON/edge/BgEdgeDetect.cpp       |  10 +-
 lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.h |  52 ++--
 lightcrafts/jnisrc/EDISON/prompt/defs.h       |   2 +-
 lightcrafts/jnisrc/EDISON/prompt/edison.cpp   |   4 +-
 lightcrafts/jnisrc/EDISON/prompt/edison.h     |   2 +-
 .../jnisrc/EDISON/prompt/globalFnc.cpp        |  18 +-
 lightcrafts/jnisrc/EDISON/prompt/main.cpp     |   2 +-
 lightcrafts/jnisrc/EDISON/segm/MSReadme.txt   |   6 +-
 lightcrafts/jnisrc/EDISON/segm/RAList.cpp     |   2 +-
 lightcrafts/jnisrc/EDISON/segm/RAList.h       |   4 +-
 lightcrafts/jnisrc/EDISON/segm/ms.cpp         | 156 +++++-----
 lightcrafts/jnisrc/EDISON/segm/ms.h           | 272 +++++++++---------
 .../jnisrc/EDISON/segm/msImageProcessor.cpp   |  42 +--
 .../jnisrc/EDISON/segm/msImageProcessor.h     |  36 +--
 lightcrafts/jnisrc/EDISON/segm/msSys.cpp      |   6 +-
 lightcrafts/jnisrc/EDISON/segm/msSys.h        |  70 ++---
 .../jnisrc/EDISON/segm/msSysPrompt.cpp        |   6 +-
 lightcrafts/jnisrc/EDISON/segm/rlist.h        |   2 +-
 lightcrafts/jnisrc/EDISON/segm/tdef.h         |   6 +-
 .../jnisrc/fast_bilateral/include/array.h     |   6 +-
 .../jnisrc/fast_bilateral/include/array_n.h   |   8 +-
 .../jnisrc/fast_bilateral/include/geom.h      |   8 +-
 .../fast_bilateral/include/msg_stream.h       |   8 +-
 .../jnisrc/include/simde/simde-align.h        |   8 +-
 .../jnisrc/include/simde/simde-complex.h      |   2 +-
 .../jnisrc/include/simde/simde-constify.h     |   2 +-
 .../jnisrc/include/simde/simde-diagnostic.h   |   2 +-
 lightcrafts/jnisrc/include/simde/simde-f16.h  |   2 +-
 .../jnisrc/include/simde/x86/avx512/xorsign.h |   2 +-
 lightcrafts/jnisrc/include/simde/x86/sse.h    |   2 +-
 .../LightZone Engineering Release Notes.html  |   2 +-
 lightcrafts/mk/platform.mk                    |   2 +-
 ...lightcrafts.media.jai.codecimpl.properties |   6 +-
 ...m.lightcrafts.media.jai.opimage.properties |   2 +-
 ...m.lightcrafts.mediax.jai.remote.properties |   2 +-
 .../src/com/lightcrafts/app/Application.java  |   2 +-
 .../com/lightcrafts/app/CheckForUpdate.java   |   8 +-
 .../app/batch/BatchConfigurator.java          |   2 +-
 .../lightcrafts/image/color/ColorMatrix2.java |   8 +-
 .../image/color/ColorProfileInfo.java         |   2 +-
 .../lightcrafts/image/color/ColorScience.java |   2 +-
 .../image/export/ResolutionOption.java        |   2 +-
 .../lightcrafts/image/libs/LCJPEGWriter.java  |   2 +-
 .../com/lightcrafts/image/libs/LibRaw.java    |   2 +-
 .../image/metadata/CIFFMetadataReader.java    |   2 +-
 .../lightcrafts/image/metadata/CIFFTags.java  |   2 +-
 .../image/metadata/EXIFEncoder.java           |   2 +-
 .../image/metadata/IPTCDirectory.java         |   2 +-
 .../image/metadata/IPTCTagInfo.java           |   2 +-
 .../lightcrafts/image/metadata/IPTCTags.java  |   6 +-
 .../image/metadata/ImageMetadata.java         |   4 +-
 .../metadata/ImageMetadataDirectory.java      |   6 +-
 .../image/metadata/MetadataUtil.java          |   6 +-
 .../lightcrafts/image/metadata/TIFFTags.java  |   2 +-
 .../image/metadata/makernotes/CanonTags.java  |   2 +-
 .../metadata/providers/MakeModelProvider.java |   2 +-
 .../metadata/values/UndefinedMetaValue.java   |   2 +-
 .../image/types/AuxiliaryImageInfo.java       |   2 +-
 .../lightcrafts/image/types/ImageType.java    |   2 +-
 .../image/types/JPEGAPPDParser.java           |   2 +-
 .../image/types/TIFFConstants.java            |   2 +-
 .../jai/operator/UnSharpMaskDescriptor.java   |   2 +-
 .../jai/opimage/LCColorConvertOpImage.java    |   2 +-
 .../lightcrafts/jai/opimage/ShapedMask.java   |   2 +-
 .../com/lightcrafts/jai/utils/Functions.java  |   2 +-
 .../jai/utils/LCRecyclingTileFactory.java     |   2 +-
 .../jai/utils/LCTileScheduler.java            |  12 +-
 .../com/lightcrafts/model/CloneContour.java   |   2 +-
 .../src/com/lightcrafts/model/Preview.java    |   2 +-
 .../com/lightcrafts/model/SliderConfig.java   |   2 +-
 .../platform/DefaultAlertDialog.java          |   2 +-
 .../ui/browser/model/ImageList.java           |   2 +-
 .../ui/browser/view/BrowserScrollPaneUI.java  |   2 +-
 .../view/ImageDatumRatingRenderer.java        |   2 +-
 .../browser/view/ImageDatumTypeRenderer.java  |   2 +-
 .../view/ImageDatumUrgencyRenderer.java       |   2 +-
 .../browser/view/ImageGroupCountRenderer.java |   2 +-
 .../browser/view/ImagePreservationQueue.java  |   2 +-
 .../com/lightcrafts/ui/crop/CropOverlay.java  |   2 +-
 .../ui/datatips/xswing/DataTipComponent.java  |   4 +-
 .../ui/datatips/xswing/DataTipListener.java   |   4 +-
 .../src/com/lightcrafts/ui/editor/Editor.java |   2 +-
 .../lightcrafts/ui/export/ExportLogic.java    |   2 +-
 .../ui/export/ExportSizeFields.java           |   2 +-
 .../lightcrafts/ui/export/SaveOptions.java    |   8 +-
 .../lightcrafts/ui/help/HelpConstants.java    |   2 +-
 .../ui/layout/FadingTabbedPanelListener.java  |   2 +-
 .../com/lightcrafts/ui/mode/ModeOverlay.java  |   2 +-
 .../generic/ConfiguredTextField.java          |   2 +-
 .../ui/operation/zone/ComponentScaler.java    |   2 +-
 .../lightcrafts/ui/print/PositionPanel.java   |   2 +-
 .../com/lightcrafts/ui/print/SizePanel.java   |   2 +-
 .../lightcrafts/ui/region/RegionModel.java    |   2 +-
 .../lightcrafts/ui/region/RegionOverlay.java  |   2 +-
 .../ui/region/curves/CubicBezierCurve.java    |   2 +-
 .../ui/scroll/CenteringViewportLayout.java    |   2 +-
 .../ui/swing/RangeSelectorModel.java          |   4 +-
 .../ui/templates/TemplateRootNode.java        |   2 +-
 .../ui/toolkit/CoolButtonBackground.java      |   2 +-
 .../lightcrafts/ui/toolkit/IconFactory.java   |   2 +-
 .../lightcrafts/ui/toolkit/ShadowFactory.java |   4 +-
 .../src/com/lightcrafts/utils/LCMS.java       |   6 +-
 .../src/com/lightcrafts/utils/Rational.java   |   2 +-
 .../src/com/lightcrafts/utils/TextUtil.java   |   4 +-
 .../utils/bytebuffer/LCByteBuffer.java        |   4 +-
 .../lightcrafts/utils/file/FileIterator.java  |   2 +-
 .../com/lightcrafts/utils/file/FileUtil.java  |   2 +-
 .../src/com/lightcrafts/utils/raw/DCRaw.java  |   2 +-
 .../utils/thread/ProgressThread.java          |   2 +-
 .../test/src/tilecachetool/TCInfo.java        |   2 +-
 lightcrafts/tools/bin/lc-locale-unflatten.sh  |   2 +-
 .../lightcrafts/app/other/MacApplication.java |   2 +-
 .../platform/macosx/AppleScript.java          |   2 +-
 .../platform/macosx/MacOSXSmartFolder.java    |   2 +-
 .../app/other/WindowsApplication.java         |   2 +-
 121 files changed, 498 insertions(+), 498 deletions(-)

diff --git a/lightcrafts/coprocesses/dcraw/dcraw_lz.c b/lightcrafts/coprocesses/dcraw/dcraw_lz.c
index 9ab9bb3e0..b5ef7c6ca 100644
--- a/lightcrafts/coprocesses/dcraw/dcraw_lz.c
+++ b/lightcrafts/coprocesses/dcraw/dcraw_lz.c
@@ -3140,7 +3140,7 @@ void CLASS remove_zeroes()
 }
 
 /*
-   Seach from the current directory up to the root looking for
+   Search from the current directory up to the root looking for
    a ".badpixels" file, and fix those pixels now.
  */
 void CLASS bad_pixels (const char *cfname)
@@ -4257,7 +4257,7 @@ void CLASS xtrans_interpolate (int passes)
 		homo[d][row][col] += (drv[d][row+v][col+h] <= tr);
 	}
 
-/* Average the most homogenous pixels for the final result:	*/
+/* Average the most homogeneous pixels for the final result:	*/
       if (height-top < TS+4) mrow = height-top+2;
       if (width-left < TS+4) mcol = width-left+2;
       for (row = MIN(top,8); row < mrow-8; row++)
@@ -4387,7 +4387,7 @@ void CLASS ahd_interpolate()
 		homo[d][tr][tc]++;
 	}
       }
-/*  Combine the most homogenous pixels for the final result:	*/
+/*  Combine the most homogeneous pixels for the final result:	*/
       for (row=top+3; row < top+TS-3 && row < height-5; row++) {
 	tr = row-top;
 	for (col=left+3; col < left+TS-3 && col < width-5; col++) {
diff --git a/lightcrafts/coprocesses/dcraw/patches/xtrans_yama1968.patch b/lightcrafts/coprocesses/dcraw/patches/xtrans_yama1968.patch
index 32ce027b8..8d6a09504 100644
--- a/lightcrafts/coprocesses/dcraw/patches/xtrans_yama1968.patch
+++ b/lightcrafts/coprocesses/dcraw/patches/xtrans_yama1968.patch
@@ -177,7 +177,7 @@ Index: dcraw/dcraw_lz.c
 +		homo[d][row][col] += (drv[d][row+v][col+h] <= tr);
  	}
  
- /* Average the most homogenous pixels for the final result:	*/
+ /* Average the most homogeneous pixels for the final result:	*/
 @@ -4893,8 +4967,11 @@ void CLASS xtrans_interpolate (int passe
  	for (col = MIN(left,8); col < mcol-8; col++) {
  	  for (d=0; d < ndir; d++)
diff --git a/lightcrafts/help/Danish/Regions-Creating.html b/lightcrafts/help/Danish/Regions-Creating.html
index a890d3285..7ecf7863a 100644
--- a/lightcrafts/help/Danish/Regions-Creating.html
+++ b/lightcrafts/help/Danish/Regions-Creating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">
diff --git a/lightcrafts/help/Dutch/Regions-Creating.html b/lightcrafts/help/Dutch/Regions-Creating.html
index 78dfcd64d..19a197810 100644
--- a/lightcrafts/help/Dutch/Regions-Creating.html
+++ b/lightcrafts/help/Dutch/Regions-Creating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">
diff --git a/lightcrafts/help/English/Regions-Creating.html b/lightcrafts/help/English/Regions-Creating.html
index 4def3fe46..528ae10c7 100644
--- a/lightcrafts/help/English/Regions-Creating.html
+++ b/lightcrafts/help/English/Regions-Creating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">
diff --git a/lightcrafts/help/Spanish/Regions-Creating.html b/lightcrafts/help/Spanish/Regions-Creating.html
index 4ef035f25..460b9aa04 100644
--- a/lightcrafts/help/Spanish/Regions-Creating.html
+++ b/lightcrafts/help/Spanish/Regions-Creating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">
diff --git a/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.cpp b/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.cpp
index f5828ec4e..4956346a7 100644
--- a/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.cpp
+++ b/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.cpp
@@ -529,8 +529,8 @@ void BgEdgeDetect::DoRecompute(BgEdgeList* cel, double nmxr, double nmxc,
    tdh = new float[x_*y_];
    tdl = new float[x_*y_];
    
-   //Nonmaximum supression
-   bgLog("...nonmaxima supression: ");
+   //Nonmaximum suppression
+   bgLog("...nonmaxima suppression: ");
 
    float (BgEdgeDetect::*fcomp)(float,float,float,float);
    float (BgEdgeDetect::*feval)(float,float);
@@ -798,8 +798,8 @@ void BgEdgeDetect::DoEdgeDetect(BgImage* cim, BgEdgeList* cel, double nmxr, doub
    bgLog("...computing ranks\n");
    CompRanks(tr, permRank_);
    
-   // new nonmaxima supression
-   bgLog("...nonmaxima supression: ");
+   // new nonmaxima suppression
+   bgLog("...nonmaxima suppression: ");
 
    // select appropriate function
    float (BgEdgeDetect::*fcomp)(float,float,float,float);
@@ -1221,7 +1221,7 @@ void BgEdgeDetect::CompRanks(float* strength, float* ranks)
       ra[ii] = strength[ii];
    }
 
-   //heap sort with ranks (from numerical recipies)
+   //heap sort with ranks (from numerical recipes)
    unsigned long i, ir, j, l;
    unsigned long n;
    n = x_*y_;
diff --git a/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.h b/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.h
index c07689d60..7bf365d53 100644
--- a/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.h
+++ b/lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.h
@@ -7,10 +7,10 @@
 // Copyright:   (c) Bogdan Georgescu
 // Version:     v0.1
 /////////////////////////////////////////////////////////////////////////////
-
+
 #define PI 3.1415926535
 #define ZERO_TRESH 0.0000000001
-
+
 // default values for edge detection
 #define CONF_NMX 0.5
 #define RANK_NMX 0.5
@@ -20,14 +20,14 @@
 #define RANK_L 0.99
 #define NMIN 5
 #define KERNEL_SIZE 2
-
+
 #define HYST_LOW_CUT 0.0
 #define MAX_CUSTT 30
 #define MAX_FILTS 31
 #define NO_ANGLES 361
-
+
 #define ALF_TRESH PI/4
-
+
 static const int gNb[8][2]=
 {
    1, 0,
@@ -39,7 +39,7 @@ static const int gNb[8][2]=
   -1, 1,
   -1,-1
 };
-
+
 static const double gAlpha[8][2]=
 {
      PI/2,   PI/2,
@@ -51,12 +51,12 @@ static const double gAlpha[8][2]=
    3*PI/4, 3*PI/4,
      PI/4,   PI/4
 };
-
+
 // main class, edge detection
 class BgEdgeDetect
 {
 public:
-
+
    // main function for edge detection
    // cim input image
    // cel edge list (will be filled with pixels on edges)
@@ -66,22 +66,22 @@ class BgEdgeDetect
    // nMin, min number of pixels on an edge
    // nmxType, hystTypeHigh, hystTypeLow, type of nmx curve, hyst. high curve, hyst low curve
    //  in (FC_ELLIPSE, FC_VERT_LINE, FC_HORIZ_LINE, FC_LINE, FC_SQUARE_BOX, FC_CUSTOM)
-
+
    void DoEdgeDetect(BgImage* cim, BgEdgeList* cel, double nmxr, double nmxc,
                      double rh, double ch, double rl, double cl,
-                     int nMin, int nmxType, int hystTypeHigh, int hystTypeLow);
-
-   // computes confidence map and rank information of sepcified image
+                     int nMin, int nmxType, int hystTypeHigh, int hystTypeLow);
+
+   // computes confidence map and rank information of specified image
    void ComputeEdgeInfo(BgImage*, float*, float*);
-//   void ComputeConfidenceMap1(BgImage*, float*);
+//   void ComputeConfidenceMap1(BgImage*, float*);
    // if have permanent data, call this function (compute only last two steps is same kernel size)
    void DoRecompute(BgEdgeList*, double, double, double, double, double, double, int, int, int, int);
-
+
    BgEdgeDetect(int filtDim);
    ~BgEdgeDetect();
-
+
    void SaveNmxValues();
-
+
    float EllipseEval(float, float);
    float EllipseComp(float, float, float, float);
    float LineEval(float, float);
@@ -94,12 +94,12 @@ class BgEdgeDetect
    float SquareComp(float, float, float, float);
    float CustomRegionEval(float, float);
    float CustomRegionComp(float, float, float, float);
-
+
    void SetCustomHigh(int*, int*, int, int, int);
    void SetCustomLow(int*, int*, int, int, int);
    void SetCustomHigh(double*, double*, int);
    void SetCustomLow(double*, double*, int);
-
+
    void IsGood(void);
    void GetPixels(int*, int*, int*, double, double, double, double);
    void GetNmxPixels(int*, int*, int*, double, double, double, double);
@@ -111,25 +111,25 @@ class BgEdgeDetect
    double mN_[MAX_FILTS][MAX_FILTS];
    double mQ_[MAX_FILTS][MAX_FILTS];
    double* lookTable_[NO_ANGLES];
-
+
    int WW_;
    int WL_;
    float confTr_;
    float rankTr_;
-
+
    float* custx_;
    float* custy_;
    float* tcustx_;
    float* tcusty_;
    int ncust_;
-
+
    float* hcustx_;
    float* hcusty_;
    int nhcust_;
    float* lcustx_;
    float* lcusty_;
    int nlcust_;   
-
+
    int x_;
    int y_;
    float* permConf_;
@@ -137,9 +137,9 @@ class BgEdgeDetect
    float* permNmxRank_;
    float* permNmxConf_;
    bool havePerm_;
-
+
 protected:
-
+
    void GenerateMaskAngle(double*, double);
    void CreateFilters(void);	
    void CreateLookTable(void);
@@ -154,14 +154,14 @@ class BgEdgeDetect
    void NewHysteresisTr(float*, float*, BgEdgeList*, int, float*, float*);
    void NewEdgeFollow(int, int);
    void SubspaceEstim(float*, float*, float*, float*);
-
+
    float* te_;
    float* tm_;
    double low_;
    float* tc_;
    float* tl_;
    int npt_;
-
+
    float* grx_;
    float* gry_;
    float* permGx_;
diff --git a/lightcrafts/jnisrc/EDISON/prompt/defs.h b/lightcrafts/jnisrc/EDISON/prompt/defs.h
index e26155008..49095f967 100644
--- a/lightcrafts/jnisrc/EDISON/prompt/defs.h
+++ b/lightcrafts/jnisrc/EDISON/prompt/defs.h
@@ -128,7 +128,7 @@ enum {
   CURVE_CUSTOM
 };
 
-//define custum curve parameters
+//define custom curve parameters
 enum {
   CUST_CURVE_HYST_HIGH,
   CUST_CURVE_HYST_LOW,
diff --git a/lightcrafts/jnisrc/EDISON/prompt/edison.cpp b/lightcrafts/jnisrc/EDISON/prompt/edison.cpp
index 520c91366..fb8616a73 100644
--- a/lightcrafts/jnisrc/EDISON/prompt/edison.cpp
+++ b/lightcrafts/jnisrc/EDISON/prompt/edison.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////
 // Name     : edison.cpp
-// Purpose  : Wrapper class used for segmenation and
+// Purpose  : Wrapper class used for segmentation and
 //            edge detection.
 // Author   : Chris M. Christoudias
 // Modified by
@@ -359,7 +359,7 @@ int EDISON::EdgeDetect( void )
 } 
 
 ////////////////////////////////////////////////////////
-//Image Segmenation
+//Image Segmentation
 ////////////////////////////////////////////////////////
 
 int EDISON::Filter( void )
diff --git a/lightcrafts/jnisrc/EDISON/prompt/edison.h b/lightcrafts/jnisrc/EDISON/prompt/edison.h
index 4290a329d..a09ac3ba1 100644
--- a/lightcrafts/jnisrc/EDISON/prompt/edison.h
+++ b/lightcrafts/jnisrc/EDISON/prompt/edison.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////
 // Name     : edison.h
-// Purpose  : Wrapper class used for segmenation and
+// Purpose  : Wrapper class used for segmentation and
 //            edge detection.
 // Author   : Chris M. Christoudias
 // Modified by
diff --git a/lightcrafts/jnisrc/EDISON/prompt/globalFnc.cpp b/lightcrafts/jnisrc/EDISON/prompt/globalFnc.cpp
index c27839c15..5ed08b632 100644
--- a/lightcrafts/jnisrc/EDISON/prompt/globalFnc.cpp
+++ b/lightcrafts/jnisrc/EDISON/prompt/globalFnc.cpp
@@ -191,7 +191,7 @@ void Report(CmCError *error, char *filename, CmCParser *srcParser)
 
   //check for unsupported file formats
   if(errorCode == SYN_UNSUPPORTED_FILETYPE) {
-    fprintf(stderr, "Version incompatability error:\n");
+    fprintf(stderr, "Version incompatibility error:\n");
     fprintf(stderr, "Line %d (argument '%s') Error: %s\n", lineNumber, token, ErrorMsgTable[errorCode-1]);
     return;
   }  
@@ -312,7 +312,7 @@ bool validOutputType(char *outputType)
 }
 
 //************************
-//check for valid intput type
+//check for valid input type
 //************************
 
 bool validInputType(char *inputType)
@@ -561,7 +561,7 @@ CmCError CheckSyntax(char *filename, CmCParser *synParser)
 
 	if(parameterId != UNKNOWN_PARAMETER) {
 	  
-	  //retreive tokens expected given a parameter
+	  //retrieve tokens expected given a parameter
 	  error = GetParamTokenSet(tokenSet, synParser);
 	  if(error == SYN_ERROR) return CmCError(token, SYN_ERROR);
 	  
@@ -603,7 +603,7 @@ CmCError CheckSyntax(char *filename, CmCParser *synParser)
   //reset parser
   synParser->StartOver();
   
-  //file is syntaxically correct
+  //file is syntactically correct
   return CmCError((CmCToken *) NULL, NO_ERRORS);
   
 }
@@ -829,10 +829,10 @@ int EXECUTE(int cmdId, CmCParser *script, void **paramTable)
     token = script->GetToken(); //get flag
     if(!strcmp(token->token_, "ON")) {
       CmCUseCustomWeightMap = true;
-      CmCPrompt("Custum weight map IN-USE (if defined).\n");
+      CmCPrompt("Custom weight map IN-USE (if defined).\n");
     } else {
       CmCUseCustomWeightMap = false;
-      CmCPrompt("Custum weight map IN-ACTIVE.\n");
+      CmCPrompt("Custom weight map IN-ACTIVE.\n");
     }
     script->GetToken(); //skip ';'
     break;
@@ -978,7 +978,7 @@ int EXECUTE(int cmdId, CmCParser *script, void **paramTable)
     break;
   }
 
-  //command executed succesfully!
+  //command executed successfully!
   return NO_ERRORS;
 
 }    
@@ -1043,7 +1043,7 @@ CmCError Run(CmCParser *script)
       if(tokenId != UNKNOWN_PARAMETER) {
 	error = SET(tokenId, script, paramTable);
 	if(error) return CmCError(token, error);
-      //token is custum curve list, so read it
+      //token is custom curve list, so read it
       } else {
 	tokenId = CustomCurve(token->token_);
 	error = READLIST(tokenId, script, paramTable);
@@ -1060,7 +1060,7 @@ CmCError Run(CmCParser *script)
   //reset script parser
   script->StartOver();
   
-  //script has been run succesfully!
+  //script has been run successfully!
   return CmCError((CmCToken *) NULL, NO_ERRORS);
 
 }
diff --git a/lightcrafts/jnisrc/EDISON/prompt/main.cpp b/lightcrafts/jnisrc/EDISON/prompt/main.cpp
index 64b4ac501..0dfb5baa7 100644
--- a/lightcrafts/jnisrc/EDISON/prompt/main.cpp
+++ b/lightcrafts/jnisrc/EDISON/prompt/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
   }
   
   //parse the source file and check for
-  //syntaxical errors
+  //syntactical errors
   CmCParser *srcParser = new CmCParser;
   CmCError error = CheckSyntax(argv[1], srcParser);
   if(error.errorCode_) {
diff --git a/lightcrafts/jnisrc/EDISON/segm/MSReadme.txt b/lightcrafts/jnisrc/EDISON/segm/MSReadme.txt
index 301ad2689..6b530d3f9 100644
--- a/lightcrafts/jnisrc/EDISON/segm/MSReadme.txt
+++ b/lightcrafts/jnisrc/EDISON/segm/MSReadme.txt
@@ -52,7 +52,7 @@ The modes returned by GetRegions are not in the RGB space. If DefineImage was us
 	msImageProcessor::RGBtoLUV	- converts data points from the RGB data space to LUV
 	msImageProcessor::LUVtoRGB	- converts data points from the LUV data space to RGB
 
-Alternatively, mean shift may be applyed to data that lies in a space other than LUV. This may be accomplished through the use of the method MeanShift::DefineLInput (see section D).
+Alternatively, mean shift may be applied to data that lies in a space other than LUV. This may be accomplished through the use of the method MeanShift::DefineLInput (see section D).
 
 ================================================================================================
 
@@ -94,7 +94,7 @@ For data that is defined on a lattice, it is always assumed that the spatial dom
 
 -------------------------------------------------------------------------------------------------
 
-Mean shift filtering and segmentation may be performed on an arbitary image data space. Such data is defined through calling the inherited method:
+Mean shift filtering and segmentation may be performed on an arbitrary image data space. Such data is defined through calling the inherited method:
 
 	MeanShift::DefineLInput	- specifies input defined on a lattice
 
@@ -108,7 +108,7 @@ DefineImage() calls this method using the LUV data it generates. Through the use
 
 The mean shift image processor class uses an error message string and error-level flag to perform error handling. These two variables, MeanShift::ErrorMessage and MeanShift::ErrorLevel, are public data members of the class.
 
-Upon the occurance of an error,
+Upon the occurrence of an error,
 
 	* An error message is copied into the error message string.
 	* The error level of the class is set to EL_ERROR.
diff --git a/lightcrafts/jnisrc/EDISON/segm/RAList.cpp b/lightcrafts/jnisrc/EDISON/segm/RAList.cpp
index eda5ddf02..96606a493 100644
--- a/lightcrafts/jnisrc/EDISON/segm/RAList.cpp
+++ b/lightcrafts/jnisrc/EDISON/segm/RAList.cpp
@@ -65,7 +65,7 @@ RAList::RAList( void )
 	label			= -1;
 	next			= NULL;
 
-	//initialize edge strenght weight and count
+	//initialize edge strength weight and count
 	edgeStrength	= 0;
 	edgePixelCount	= 0;
 }
diff --git a/lightcrafts/jnisrc/EDISON/segm/RAList.h b/lightcrafts/jnisrc/EDISON/segm/RAList.h
index deb2584bb..ed593f634 100644
--- a/lightcrafts/jnisrc/EDISON/segm/RAList.h
+++ b/lightcrafts/jnisrc/EDISON/segm/RAList.h
@@ -17,7 +17,7 @@
 	and to prune spurious regions during image segmentation.
 
 	The prototype for the RAList class is provided below. Its
-	defition is provided in "RAList.cc".
+	definition is provided in "RAList.cc".
 
 The theory is described in the papers:
 
@@ -62,7 +62,7 @@ class RAList {
 	/* Class Constructor and Destructor */
 	/*\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
 
-	//***Class Constrcutor***
+	//***Class Constructor***
 	RAList( void );
 
 	//***Class Destructor***
diff --git a/lightcrafts/jnisrc/EDISON/segm/ms.cpp b/lightcrafts/jnisrc/EDISON/segm/ms.cpp
index af2e81dd3..226a499c0 100644
--- a/lightcrafts/jnisrc/EDISON/segm/ms.cpp
+++ b/lightcrafts/jnisrc/EDISON/segm/ms.cpp
@@ -41,38 +41,38 @@ and they are is available at:
 
 Implemented by Chris M. Christoudias, Bogdan Georgescu
 ********************************************************/
-
-
-//Include Needed Libraries
-
-#include	"ms.h"
-#include	<string.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<math.h>
+
+
+//Include Needed Libraries
+
+#include	"ms.h"
+#include	<string.h>
+#include	<stdlib.h>
+#include	<stdio.h>
+#include	<math.h>
 
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@      PUBLIC METHODS     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
-  /*** Constructor/Destructor ***/
-  /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
-
-/*******************************************************/
-/*Class Constructor                                    */
-/*******************************************************/
-/*Post:                                                */
-/*      The MeanShift class has been properly          */
-/*      initialized.                                   */
-/*******************************************************/
-
-MeanShift::MeanShift( void )
-{
-	
-	//intialize input data set parameters...
+
+  /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
+  /*** Constructor/Destructor ***/
+  /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
+
+/*******************************************************/
+/*Class Constructor                                    */
+/*******************************************************/
+/*Post:                                                */
+/*      The MeanShift class has been properly          */
+/*      initialized.                                   */
+/*******************************************************/
+
+MeanShift::MeanShift( void )
+{
+	
+	//initialize input data set parameters...
 	P							= NULL;
 	L							= 0;
 	N							= 0;
@@ -86,11 +86,11 @@ MeanShift::MeanShift( void )
 	forest						= NULL;
 	range						= NULL;
 	
-	//intialize lattice structure...
+	//initialize lattice structure...
 	height						= 0;
 	width						= 0;
 	
-	//intialize kernel strucuture...
+	//initialize kernel structure...
 	h							= NULL;
 	kernel						= NULL;
 	w							= NULL;
@@ -101,7 +101,7 @@ MeanShift::MeanShift( void )
 	//initialize weight function linked list...
 	head						= cur	= NULL;
 	
-	//intialize mean shift processing data structures...
+	//initialize mean shift processing data structures...
 	uv							= NULL;
 
 	//set lattice weight map to null
@@ -122,26 +122,26 @@ MeanShift::MeanShift( void )
 	class_state.LATTICE_DEFINED	= false;
 	class_state.OUTPUT_DEFINED	= false;
 	
-}
-
-/*******************************************************/
-/*Class Destructor                                     */
-/*******************************************************/
-/*Post:                                                */
-/*      The MeanShift class has been properly          */
-/*      destroyed.                                     */
-/*******************************************************/
-
-MeanShift::~MeanShift( void )
-{
+}
+
+/*******************************************************/
+/*Class Destructor                                     */
+/*******************************************************/
+/*Post:                                                */
+/*      The MeanShift class has been properly          */
+/*      destroyed.                                     */
+/*******************************************************/
+
+MeanShift::~MeanShift( void )
+{
 	delete [] ErrorMessage;
    if (weightMap)
    {
       delete [] weightMap;
    }
-
+
 	//de-allocate memory used to store
-	//user defined weight functions
+	//user defined weight functions
 	ClearWeightFunctions();
 	
 	//de-allocate memory used for kernel
@@ -159,7 +159,7 @@ MeanShift::~MeanShift( void )
 /*******************************************************/
 /*Define Kernel                                        */
 /*******************************************************/
-/*Creats custom user defined Kernel to be used by the  */
+/*Creates custom user defined Kernel to be used by the */
 /*mean shift procedure.                                */
 /*******************************************************/
 /*Pre:                                                 */
@@ -244,7 +244,7 @@ void MeanShift::DefineKernel(kernelType *kernel_, float *h_, int *P_, int kp_)
 	//done.
 	return;
 	
-}
+}
 
 /*******************************************************/
 /*Add Weight Function                                  */
@@ -289,7 +289,7 @@ void MeanShift::AddWeightFunction(double g(double), float halfWindow, int sample
 		cur = cur->next;
 	
 	// Entry Exists - Replace It! 
-	// Otherwise insert at the head of the the weight functon list
+	// Otherwise insert at the head of the the weight function list
 	if(cur)
 		delete cur->w;
 	else
@@ -607,7 +607,7 @@ void MeanShift::msVector(double *Mh, double *yk)
 /*Lattice Mean Shift Vector                            */
 /*******************************************************/
 /*Calculates the mean shift vector at a specified data */
-/*point yk, assuming that the data set exhists on a    */
+/*point yk, assuming that the data set exists on a     */
 /*height x width two dimensional lattice.              */
 /*******************************************************/
 /*Pre:                                                 */
@@ -712,7 +712,7 @@ void MeanShift::FindMode(double *mode, double *yk)
 		for(i = 0; i < N; i++)
 			mvAbs	+= Mh[i]*Mh[i];
 		
-		//increment interation count...
+		//increment iteration count...
 		iterationCount++;
 		
 	}
@@ -733,7 +733,7 @@ void MeanShift::FindMode(double *mode, double *yk)
 /*Find Lattice Mode                                    */
 /*******************************************************/
 /*Calculates the mode of a specified data point yk,    */
-/*assuming that the data set exhists on a height x     */
+/*assuming that the data set exists on a height x      */
 /*width two dimensional lattice.                       */
 /*******************************************************/
 /*Pre:                                                 */
@@ -809,7 +809,7 @@ void MeanShift::FindLMode(double *mode, double *yk)
 		for(i = 0; i < gridN; i++)
 			mvAbs	+= Mh[i]*Mh[i];
 		
-		//increment interation count...
+		//increment iteration count...
 		iterationCount++;
 		
 	}
@@ -936,7 +936,7 @@ void MeanShift::MSVector(double *Mh_ptr, double *yk_ptr)
 /*******************************************************/
 /*Lattice Mean Shift Vector                            */
 /*******************************************************/
-/*Computes the mean shift vector at a specfied window  */
+/*Computes the mean shift vector at a specified window  */
 /*yk using the lattice data structure.                 */
 /*******************************************************/
 /*Pre:                                                 */
@@ -994,7 +994,7 @@ void MeanShift::LatticeMSVector(double *Mh_ptr, double *yk_ptr)
 /*******************************************************/
 /*Optimized Lattice Mean Shift Vector                  */
 /*******************************************************/
-/*Computes the mean shift vector at a specfied window  */
+/*Computes the mean shift vector at a specified window  */
 /*yk using the lattice data structure. Also the points */
 /*that lie within the window are stored into the basin */
 /*of attraction structure used by the optimized mean   */
@@ -1095,7 +1095,7 @@ void MeanShift::classConsistencyCheck(int iN, bool usingLattice)
 	//make sure that the lattice is defined if it is being used
 	if((class_state.LATTICE_DEFINED == false)&&(usingLattice))
 	{
-		ErrorHandler("MeanShift", "classConsistencyCheck", "Latice not created.");
+		ErrorHandler("MeanShift", "classConsistencyCheck", "Lattice not created.");
 		return;
 	}
 	
@@ -1118,7 +1118,7 @@ void MeanShift::classConsistencyCheck(int iN, bool usingLattice)
 	return;
 	
 }
-
+
   /*/\/\/\/\/\/\/\/\/\/\/\/\/\*/
   /*** Class Error Handler  ***/
   /*\/\/\/\/\/\/\/\/\/\/\/\/\/*/
@@ -1170,7 +1170,7 @@ void MeanShift::ErrorHandler(const char *className, const char *methodName, cons
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@     PRIVATE METHODS     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
+
   /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
   /*** Kernel Creation/Manipulation ***/
   /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
@@ -1194,10 +1194,10 @@ void MeanShift::ErrorHandler(const char *className, const char *methodName, cons
 /*      - uniformKernel is set to true if the kernel   */
 /*        to be used is uniform, false is returned     */
 /*        otherwise                                    */
-/*      - if a user defined weight function is requred */
-/*        for a given subspace but not defined in the  */
-/*        user defined weight function list, an error  */
-/*        is flagged and the program is halted         */
+/*      - if a user defined weight function is requir- */
+/*        ed for a given subspace but not defined in   */
+/*        the user defined weight function list, an    */
+/*        error is flagged and the program is halted   */
 /*******************************************************/
 
 void MeanShift::generateLookupTable( void )
@@ -1219,8 +1219,8 @@ void MeanShift::generateLookupTable( void )
     {
 		switch(kernel[i])
 		{
-			// *Uniform Kernel* has weight funciton w(u) = 1
-			// therefore, a weight funciton lookup table is
+			// *Uniform Kernel* has weight function w(u) = 1
+			// therefore, a weight function lookup table is
 			// not needed for this kernel --> w[i] = NULL indicates
 			// this
 		case Uniform:
@@ -1329,7 +1329,7 @@ void MeanShift::DestroyKernel( void )
       w = NULL;
    }
    
-	//intialize kernel for re-use...
+	//initialize kernel for re-use...
 	kp		= 0;
 	kernel	= NULL;
 	h		= NULL;
@@ -1432,12 +1432,12 @@ void MeanShift::InitializeInput(float *x)
 /*******************************************************/
 /*Reset Input                                          */
 /*******************************************************/
-/*De-allocates memory for and re-intializes input data */
+/*De-allocates memory for and re-initializes input data */
 /*structure.                                           */
 /*******************************************************/
 /*Post:                                                */
 /*      - the memory of the input data structure has   */
-/*        been de-allocated and this strucuture has    */
+/*        been de-allocated and this structure has     */
 /*        been initialized for re-use.                 */
 /*******************************************************/
 
@@ -1839,7 +1839,7 @@ void MeanShift::generalSearch(tree *gt, int gd, double *Mh_ptr, double *yk_ptr)
 							// Linear interpolate values given by
 							// lookup table
 							
-							// Calculate x0 and x1, the points surounding
+							// Calculate x0 and x1, the points surrounding
 							// u
 							x0 = (int)(u/increment[j]);
 							x1 = x0+1;
@@ -1907,7 +1907,7 @@ void MeanShift::generalSearch(tree *gt, int gd, double *Mh_ptr, double *yk_ptr)
 /*                                                     */
 /*NOTE: This method is the only method in the          */
 /*      MeanShift class that uses the weight           */
-/*      map asside from optUniformLSearch.             */
+/*      map aside from optUniformLSearch.              */
 /*******************************************************/
 /*Pre:                                                 */
 /*      - Mh_ptr is a length N array of doubles        */
@@ -2010,7 +2010,7 @@ void MeanShift::uniformLSearch(double *Mh_ptr, double *yk_ptr)
 }
 
 /*******************************************************/
-/*Optimized Uniform Latice Search                      */
+/*Optimized Uniform Lattice Search                     */
 /*******************************************************/
 /*Performs search on data set for all points lying     */
 /*within the search window defined using a uniform     */
@@ -2021,7 +2021,7 @@ void MeanShift::uniformLSearch(double *Mh_ptr, double *yk_ptr)
 /*                                                     */
 /*NOTE: This method is the only method in the          */
 /*      MeanShift class that uses the weight           */
-/*      map asside from uniformLSearch.                */
+/*      map aside from uniformLSearch.                 */
 /*******************************************************/
 /*Pre:                                                 */
 /*      - Mh_ptr is a length N array of doubles        */
@@ -2029,7 +2029,7 @@ void MeanShift::uniformLSearch(double *Mh_ptr, double *yk_ptr)
 /*      - Mh_ptr is the sum of the data points found   */
 /*        within search window having center yk_ptr    */
 /*Post:                                                */
-/*      - a search on the data set using the latice    */
+/*      - a search on the data set using the lattice   */
 /*        has been performed, and all points found to  */
 /*        lie within the search window defined using   */
 /*        a uniform kernel are summed and counted.     */
@@ -2048,12 +2048,12 @@ void MeanShift::optUniformLSearch(double *Mh_ptr, double *yk_ptr)
 	int				s, p, dataPoint, pointIndx, lN;
 	double			diff, el, dx, dy, tx, weight;
 	
-	//Define latice data dimension...
+	//Define lattice data dimension...
 	lN	= N + 2;
 	
-	//Define bounds of latice...
+	//Define bounds of lattice...
 	
-	//the latice is a 2dimensional subspace whose
+	//the lattice is a 2dimensional subspace whose
 	//search window bandwidth is specified by
 	//h[0]:
 	tx = yk_ptr[0] - h[0] + DELTA + 0.99;
@@ -2077,7 +2077,7 @@ void MeanShift::optUniformLSearch(double *Mh_ptr, double *yk_ptr)
 	else
 		UpperBoundY = (int) tx;
 	
-	//Perform search using latice
+	//Perform search using lattice
 	for(i = LowerBoundY; i <= UpperBoundY; i++)
 		for(j = LowerBoundX; j <= UpperBoundX; j++)
 		{
@@ -2256,7 +2256,7 @@ void MeanShift::generalLSearch(double *Mh_ptr, double *yk_ptr)
 						// Linear interpolate values given by
 						// lookup table
 						
-						// Calculate x0 and x1, the points surounding
+						// Calculate x0 and x1, the points surrounding
 						// u
 						x0 = (int)(u/increment[k]);
 						x1 = x0+1;
@@ -2413,7 +2413,7 @@ void MeanShift::optGeneralLSearch(double *Mh_ptr, double *yk_ptr)
 						// Linear interpolate values given by
 						// lookup table
 						
-						// Calculate x0 and x1, the points surounding
+						// Calculate x0 and x1, the points surrounding
 						// u
 						x0 = (int)(u/increment[k]);
 						x1 = x0+1;
@@ -2458,8 +2458,8 @@ void MeanShift::optGeneralLSearch(double *Mh_ptr, double *yk_ptr)
 
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ END OF CLASS DEFINITION @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ END OF CLASS DEFINITION @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-
+
+
diff --git a/lightcrafts/jnisrc/EDISON/segm/ms.h b/lightcrafts/jnisrc/EDISON/segm/ms.h
index bbb5cc1bc..9460c454e 100644
--- a/lightcrafts/jnisrc/EDISON/segm/ms.h
+++ b/lightcrafts/jnisrc/EDISON/segm/ms.h
@@ -1,17 +1,17 @@
-/*******************************************************
-
-                 Mean Shift Analysis Library
-	=============================================
-
-	The mean shift library is a collection of routines
-	that use the mean shift algorithm. Using this algorithm,
-	the necessary output will be generated needed
-	to analyze a given input set of data.
+/*******************************************************
+
+                 Mean Shift Analysis Library
+	=============================================
+
+	The mean shift library is a collection of routines
+	that use the mean shift algorithm. Using this algorithm,
+	the necessary output will be generated needed
+	to analyze a given input set of data.
 
   MeanShift Base Class:
   ====================
-
-	The mean shift library of routines is realized
+
+	The mean shift library of routines is realized
 	via the creation of a MeanShift base class. This class
 	provides a mechanism for calculating the mean shift vector
 	at a specified data point, using an arbitrary N-dimensional
@@ -27,7 +27,7 @@
 	as image filtering practical.
 
 	The MeanShift class prototype is provided below. Its
-	definition is provided in 'ms.cc'.
+	definition is provided in 'ms.cc'.
 
 The theory is described in the papers:
 
@@ -41,9 +41,9 @@ and they are is available at:
 
 Implemented by Chris M. Christoudias, Bogdan Georgescu
 ********************************************************/
-
-#ifndef MS_H
-#define MS_H
+
+#ifndef MS_H
+#define MS_H
 
 //Included needed libraries
 
@@ -54,11 +54,11 @@ Implemented by Chris M. Christoudias, Bogdan Georgescu
 //for function timing and system output
 #include	"msSys.h"
 
-//Include Debugging Constant
-//#define	DEBUG
-
-//Define Prompt - Prompts user on progress of Mean Shift algorithm
-#define	PROMPT
+//Include Debugging Constant
+//#define	DEBUG
+
+//Define Prompt - Prompts user on progress of Mean Shift algorithm
+#define	PROMPT
 
 //Define Show Progress - Prompts user on percent complete of a given
 //                       mean shift algorithm
@@ -67,30 +67,30 @@ Implemented by Chris M. Christoudias, Bogdan Georgescu
 //Define Progress Rate - Indicates the number of convergences before
 //						 checking progress
 #define PROGRESS_RATE	100
-
-// Define Macros
-#define	SWAP(d_a, d_b) temp=(d_a);(d_a)=(d_b);(d_b)=temp;
-
-// Define Structures 
-
- //k-Dimensional Binary Search Tree
-struct tree {
-  float *x;
-  tree  *right;
-  tree  *left;
-  tree  *parent;
-};
-
- // User Defined Weight Function
-struct userWeightFunct {
-   
-  double			*w;
-  double			halfWindow;
-  int				sampleNumber;
-  int				subspace;
-  userWeightFunct	*next;
-
-};
+
+// Define Macros
+#define	SWAP(d_a, d_b) temp=(d_a);(d_a)=(d_b);(d_b)=temp;
+
+// Define Structures 
+
+ //k-Dimensional Binary Search Tree
+struct tree {
+  float *x;
+  tree  *right;
+  tree  *left;
+  tree  *parent;
+};
+
+ // User Defined Weight Function
+struct userWeightFunct {
+   
+  double			*w;
+  double			halfWindow;
+  int				sampleNumber;
+  int				subspace;
+  userWeightFunct	*next;
+
+};
 
 //Define class state structure
 struct ClassStateStruct {
@@ -99,37 +99,37 @@ struct ClassStateStruct {
 	bool	LATTICE_DEFINED;
 	bool	OUTPUT_DEFINED;
 };
-
-// Define Constants
-
- // Threshold
-const double	EPSILON		= 0.01;			// define threshold (approx. Value of Mh at a peak or plateau)
-const double	MU				= 0.05;		// define threshold required that window is near convergence
-const double	TC_DIST_FACTOR	= 0.5;		// cluster search windows near convergence that are a distance
-											// h[i]*TC_DIST_FACTOR of one another (transitive closure)
-const double	SQ_TC_DFACTOR	= 0.0625;	// (TC_DIST_FACTOR)^2
-const int		LIMIT           = 100;		// define max. # of iterations to find mode
-
- // Gaussian Lookup Table
-const int		GAUSS_NUM_ELS   = 16;		// take 16 samples of exp(-u/2)
-const double	GAUSS_LIMIT     = 2.9;		// GAUSS_LIMIT     = c
+
+// Define Constants
+
+ // Threshold
+const double	EPSILON		= 0.01;			// define threshold (approx. Value of Mh at a peak or plateau)
+const double	MU				= 0.05;		// define threshold required that window is near convergence
+const double	TC_DIST_FACTOR	= 0.5;		// cluster search windows near convergence that are a distance
+											// h[i]*TC_DIST_FACTOR of one another (transitive closure)
+const double	SQ_TC_DFACTOR	= 0.0625;	// (TC_DIST_FACTOR)^2
+const int		LIMIT           = 100;		// define max. # of iterations to find mode
+
+ // Gaussian Lookup Table
+const int		GAUSS_NUM_ELS   = 16;		// take 16 samples of exp(-u/2)
+const double	GAUSS_LIMIT     = 2.9;		// GAUSS_LIMIT     = c
 const double	GAUSS_INCREMENT = GAUSS_LIMIT*GAUSS_LIMIT/GAUSS_NUM_ELS;
-											// GAUSS_INCREMENT = (c^2)/(# of samples)
-
- // Numerical Analysis
-const double	DELTA           = 0.00001;	// used for floating point to integer conversion
-
-//MeanShift Prototype
-class MeanShift {
-
- public:
-
-  /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
+											// GAUSS_INCREMENT = (c^2)/(# of samples)
+
+ // Numerical Analysis
+const double	DELTA           = 0.00001;	// used for floating point to integer conversion
+
+//MeanShift Prototype
+class MeanShift {
+
+ public:
+
+  /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
   /* Class Constructor and Destructor */
   /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
-
-  MeanShift( void ); //Default Constructor
- ~MeanShift( void ); //Class Destructor
+
+  MeanShift( void ); //Default Constructor
+ ~MeanShift( void ); //Class Destructor
 
   /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
   /* Creation/Initialization of Mean Shift Kernel */
@@ -138,14 +138,14 @@ class MeanShift {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|				  *  Define Kernel  *                |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
+  //|				  *  Define Kernel  *                     |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Uploads a custom kernel into the private data    |//
   //|   members of the mean shift class. This kernel is  |//
@@ -153,7 +153,7 @@ class MeanShift {
   //|   shift.                                           |//
   //|                                                    |//
   //|   In order to create a valid kernel the following  |//
-  //|   argumens must be provided this method:           |//
+  //|   arguments must be provided for this method:      |//
   //|                                                    |//
   //|   <* kernel *>                                     |//
   //|   A one dimensional array of type kernelType used  |//
@@ -175,9 +175,9 @@ class MeanShift {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
-  //|		DefineKernel(kernel, h, P, kp)               |//
+  //|	Usage:                                             |//
+  //| ======                                             |//
+  //|		DefineKernel(kernel, h, P, kp)                  |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
@@ -187,14 +187,14 @@ class MeanShift {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
   //|               * Add Weight Function *              |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Each subspace specified as User Defined is un-   |//
   //|   quely defined by a correlating weight function   |//
@@ -233,9 +233,9 @@ class MeanShift {
   //|                                                    |//
   //|   If a weight function is added to non-existing    |//
   //|   subspace of the input data set  (example: the    |//
-  //|   input data set containes 3 subspaces and this    |//
+  //|   input data set contains 3 subspaces and this     |//
   //|   method is given subspace = 4) then the weight    |//
-  //|   defintion will simply be ignored by the mean     |//
+  //|   definition will simply be ignored by the mean    |//
   //|   shift class.                                     |//
   //|                                                    |//
   //|   If a subspace is declared as kernel type User    |//
@@ -244,8 +244,8 @@ class MeanShift {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
+  //|	Usage:                                             |//
+  //| ======                                             |//
   //|   AddWeightFunction(g(u)        , halfWindow,      |//
   //|                     sampleNumber, subspace);       |//
   //|                                                    |//
@@ -457,7 +457,7 @@ class MeanShift {
   //|	============								     |//
   //|                                                    |//
   //|   If a kernel is created and input is uploaded,    |//
-  //|   this method calcualtes the mean shift vector,    |//
+  //|   this method calculates the mean shift vector,    |//
   //|   Mh, at specific data point yk.                   |//
   //|                                                    |//
   //|   The arguments of this method are:                |//
@@ -485,19 +485,19 @@ class MeanShift {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
   //|          *  Lattice Mean Shift Vector  *           |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   If a kernel is created and input is uploaded,    |//
-  //|   this method calcualtes the mean shift vector,    |//
+  //|   this method calculates the mean shift vector,    |//
   //|   Mh, at specific data point yk, assuming that the |//
-  //|   data set exhists on a height x width two dim-    |//
+  //|   data set exists on a height x width two dim-     |//
   //|   ensional lattice.                                |//
   //|                                                    |//
   //|   The arguments of this method are:                |//
@@ -518,8 +518,8 @@ class MeanShift {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
+  //|	Usage:                                             |//
+  //|   ======                                           |//
   //|        latticeMSVector(Mh, yk)                     |//
   //|                                                    |//
   //<--------------------------------------------------->|//
@@ -540,7 +540,7 @@ class MeanShift {
   //|	============								     |//
   //|                                                    |//
   //|   If a kernel is created and input is uploaded,    |//
-  //|   this method calcualtes the mode of a specified   |//
+  //|   this method calculates the mode of a specified   |//
   //|   data point yk.                                   |//
   //|                                                    |//
   //|   The arguments of this method are:                |//
@@ -578,9 +578,9 @@ class MeanShift {
   //|	============								     |//
   //|                                                    |//
   //|   If a kernel is created and input is uploaded,    |//
-  //|   this method calcualtes the mode of a specified   |//
+  //|   this method calculates the mode of a specified   |//
   //|   data point yk, assuming that the data set        |//
-  //|   exhists on a height x width two dimensional      |//
+  //|   exists on a height x width two dimensional      |//
   //|   lattice.                                         |//
   //|                                                    |//
   //|   The arguments of this method are:                |//
@@ -634,11 +634,11 @@ class MeanShift {
   //|	Description:								     |//
   //|	============								     |//
   //|                                                    |//
-  //|   ErrorStatus indicates if an error has occured as |//
+  //|   ErrorStatus indicates if an error has occurred as |//
   //|   a result of improper use of a mean shift library |//
   //|   class method or because of insufficient resour-  |//
   //|   ces. ErrorStatus is set to EL_ERROR (ErrorStatus |//
-  //|   = 1) if an error has occured. If no error occur- |//
+  //|   = 1) if an error has occurred. If no error occur- |//
   //|   ed when calling a particular method ErrorStatus  |//
   //|   is set to EL_OKAY (ErrorStatus = 0).             |//
   //|                                                    |//
@@ -681,7 +681,7 @@ class MeanShift {
 
    void	OptLatticeMSVector     (double*, double*);      // Uses the lattice defined by DefineLattice to compute the
 														// mean shift vector at a specified window location yk using
-														// the basin of attraction optimization for better performace
+														// the basin of attraction optimization for better performance
 														// during mean shift filtering - used by a derived class
 
     /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
@@ -789,15 +789,15 @@ class MeanShift {
 	ClassStateStruct	class_state;					//specifies the state of the class(i.e if data has been loaded into 
 														//the class, if a kernel has been defined, etc.)
 
- private:
+ private:
 
-  //========================
+  //========================
   // *** Private Methods ***
   //========================
 
 	 /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
 	 /* Kernel Creation/Manipulation */
-	 /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
+	 /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
 
    void	generateLookupTable ( void );                  // Generates Weight Function Lookup Table
 
@@ -819,18 +819,18 @@ class MeanShift {
      /* k-dimensional Binary Search Tree */
      /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
 
-	////////Data Search Tree/////////
-   tree  *BuildKDTree (tree*,  int, int, tree* );       // Builds a kd tree given a subset of points initialized
-                                                        // at depth 0 (dimension 0) (for Tree Structure)
-
-   void  QuickMedian (tree*, int, int, int );           // Finds the median tree in a forest of trees using
-                                                        // dimension d, placing the median tree in the array of tree
-                                                        // nodes at L/2, in which all trees to the left of the median tree
-                                                        // have values less than that of the median tree in dimension d
-                                                        // and all trees having values greater than that of the median tree
-                                                        // in dimension d are placd to the right of this tree -
+	////////Data Search Tree/////////
+   tree  *BuildKDTree (tree*,  int, int, tree* );       // Builds a kd tree given a subset of points initialized
+                                                        // at depth 0 (dimension 0) (for Tree Structure)
+
+   void  QuickMedian (tree*, int, int, int );           // Finds the median tree in a forest of trees using
+                                                        // dimension d, placing the median tree in the array of tree
+                                                        // nodes at L/2, in which all trees to the left of the median tree
+                                                        // have values less than that of the median tree in dimension d
+                                                        // and all trees having values greater than that of the median tree
+                                                        // in dimension d are placd to the right of this tree -
                                                         // This algorithm is used by BuildKDTree to construct a balanced tree
-
+
      /*/\/\/\/\/\/\/\/\/\/\/\/\/\/\*/
      /* Mean Shift: Using kd-Tree  */
      /*\/\/\/\/\/\/\/\/\/\/\/\/\/\/*/
@@ -867,10 +867,10 @@ class MeanShift {
 														// using a general kernel and the basin of attraction
 														// optimization for better performance
 
-
-  //=============================
+
+  //=============================
   // *** Private Data Members ***
-  //=============================
+  //=============================
 
    //##########################################
    //######### KERNEL DATA STRUCTURE ##########
@@ -896,31 +896,31 @@ class MeanShift {
 
 	tree			*forest;							// memory allocated for tree nodes
 
-	float			*range;								// range vector used to perform range search on kd tree, indexed
-														// by dimension of input - format:
-                                                        // range = {Lower_Limit_1, Upper_Limit_1, ..., Lower_Limit_N, Upper_Limit_N}
+	float			*range;								// range vector used to perform range search on kd tree, indexed
+														// by dimension of input - format:
+                                                        // range = {Lower_Limit_1, Upper_Limit_1, ..., Lower_Limit_N, Upper_Limit_N}
 
    //##########################################
    //######### MEAN SHIFT PROCESSING ##########
    //######### DATA STRUCTURES       ##########
    //##########################################
 
-	double			*uv;								// stores normalized distance vector between
-														// yk and xi
+	double			*uv;								// stores normalized distance vector between
+														// yk and xi
 
 	double			wsum;								// sum of weights calculated at data points within the sphere
-
+
    //##########################################
    //######### LATTICE DATA STRUCTURE #########
    //##########################################
 
-	////////Lattice Data Structure////////
-	int				LowerBoundX, UpperBoundX;			// Upper and lower bounds for lattice search window
-														// in the x dimension
-
-	int				LowerBoundY, UpperBoundY;			// Upper and lower bounds for lattice search window
+	////////Lattice Data Structure////////
+	int				LowerBoundX, UpperBoundX;			// Upper and lower bounds for lattice search window
+														// in the x dimension
+
+	int				LowerBoundY, UpperBoundY;			// Upper and lower bounds for lattice search window
 														// in the y dimension
-
-};
-
-#endif
+
+};
+
+#endif
diff --git a/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.cpp b/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.cpp
index c7f624152..68359c825 100644
--- a/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.cpp
+++ b/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.cpp
@@ -64,7 +64,7 @@ Implemented by Chris M. Christoudias, Bogdan Georgescu
 msImageProcessor::msImageProcessor( void )
 {
 
-	//intialize basin of attraction structure
+	//initialize basin of attraction structure
 	//used by the filtering algorithm
 	modeTable			= NULL;
 	pointList			= NULL;
@@ -80,7 +80,7 @@ msImageProcessor::msImageProcessor( void )
 	modePointCounts		= NULL;
 	regionCount			= 0;
 
-	//intialize temporary buffers used for
+	//initialize temporary buffers used for
 	//performing connected components
 	indexTable			= NULL;
 	LUV_data			= NULL;
@@ -90,7 +90,7 @@ msImageProcessor::msImageProcessor( void )
 	freeRAList			= NULL;
 	raPool				= NULL;
 
-	//intialize visit table to having NULL entries
+	//initialize visit table to having NULL entries
 	visitTable			= NULL;
 
 	//initialize epsilon such that transitive closure
@@ -145,7 +145,7 @@ msImageProcessor::~msImageProcessor( void )
 /*      - height_ and width_ define the dimension of   */
 /*        the image                                    */
 /*      - if the image is of type GREYSCALE then       */
-/*        data containes only one number per pixel     */
+/*        data contains only one number per pixel      */
 /*        location, where a pixel location is defined  */
 /*        by the index into the data array             */
 /*Post:                                                */
@@ -163,7 +163,7 @@ void msImageProcessor::DefineImage(byte *data_, imageType type, int height_, int
 	else
 		dim = 1;
 
-	//perfor rgb to luv conversion
+	//perform rgb to luv conversion
 	int		i;
 	float	*luv	= new float [height_*width_*dim];
 	if(dim == 1)
@@ -186,7 +186,7 @@ void msImageProcessor::DefineImage(byte *data_, imageType type, int height_, int
 	//defined by user
 	if(!h)
 	{
-		//define default kernel paramerters...
+		//define default kernel parameters...
 		kernelType	k[2]		= {Uniform, Uniform};
 		int			P[2]		= {2, N};
 		float		tempH[2]	= {1.0 , 1.0};
@@ -238,7 +238,7 @@ void msImageProcessor::DefineBgImage(byte* data_, imageType type, int height_, i
 	//defined by user
 	if(!h)
 	{
-		//define default kernel paramerters...
+		//define default kernel parameters...
 		kernelType	k[2]		= {Uniform, Uniform};
 		int			P[2]		= {2, N};
 		float		tempH[2]	= {1.0 , 1.0};
@@ -844,7 +844,7 @@ void msImageProcessor::Segment(int sigmaS, float sigmaR, int minRegion, SpeedUpL
 void msImageProcessor::RGBtoLUV(byte *rgbVal, float *luvVal)
 {
 
-	//delcare variables
+	//declare variables
 	double	x, y, z, L0, u_prime, v_prime, constant;
 
 	//convert RGB to XYZ...
@@ -999,7 +999,7 @@ void msImageProcessor::GetRawData(float *outputImageData)
 /*The output image is returned.                        */
 /*******************************************************/
 /*Pre:                                                 */
-/*      - outputImage is a pre-allocated unsinged char */
+/*      - outputImage is a pre-allocated unsigned char */
 /*        array used to store the filtered or segment- */
 /*        ed image pixels                              */
 /*Post:                                                */
@@ -1280,7 +1280,7 @@ void msImageProcessor::NonOptimizedFilter(float sigmaS, float sigmaR)
 			for(j = 0; j < lN; j++)
 				mvAbs += Mh[j]*Mh[j];
 
-			// Increment interation count
+			// Increment iteration count
 			iterationCount++;
 			
 		}
@@ -1831,7 +1831,7 @@ void msImageProcessor::OptimizedFilter2(float sigmaS, float sigmaR)
 			for(j = 0; j < lN; j++)
 				mvAbs += Mh[j]*Mh[j];
 
-			// Increment interation count
+			// Increment iteration count
 			iterationCount++;
 			
 		}
@@ -1984,13 +1984,13 @@ void msImageProcessor::Connect( void )
 /*Pre:                                                 */
 /*      - regionLoc is a region seed - a pixel that is */
 /*        identified as being part of the region       */
-/*        labled using the label, label.               */
+/*        labeled using the label, label.              */
 /*Post:                                                */
 /*      - all pixels belonging to the region specified */
 /*        by regionLoc (having the same integer LUV    */
 /*        value specified by LUV_data) are classified  */
 /*        as one region by labeling each pixel in the  */
-/*        image clasification structure using label    */
+/*        image classification structure using label   */
 /*        via an eight-connected fill.                 */
 /*******************************************************/
 
@@ -2054,7 +2054,7 @@ void msImageProcessor::Fill(int regionLoc, int label)
 					//increment region point count
 					modePointCounts[label]++;
 					
-					//place index of neighbor i onto the index tabel buffer
+					//place index of neighbor i onto the index table buffer
 					indexTable[++index]	= neighLoc;
 					
 					//indicate that a neighboring region pixel was
@@ -2389,11 +2389,11 @@ void msImageProcessor::TransitiveClosure( void )
 	RAList	*neighbor;
 	for(i = 0; i < regionCount; i++)
 	{
-		//aquire first neighbor in region adjacency list pointed to
+		//acquire first neighbor in region adjacency list pointed to
 		//by raList[i]
 		neighbor	= raList[i].next;
 
-		//compute edge strenght threshold using global and local
+		//compute edge strength threshold using global and local
 		//epsilon
 		if(epsilon > raList[i].edgeStrength)
 			threshold   = epsilon;
@@ -2474,7 +2474,7 @@ void msImageProcessor::TransitiveClosure( void )
 		modes_buffer[i]	= 0;
 
 	//traverse raList accumulating modes and point counts
-	//using canoncial element information...
+	//using canonical element information...
 	int k, iMPC;
 	for(i = 0; i < regionCount; i++)
 	{
@@ -2893,7 +2893,7 @@ void msImageProcessor::Prune(int minRegion)
 			modes_buffer[i]	= 0;
 		
 		//traverse raList accumulating modes and point counts
-		//using canoncial element information...
+		//using canonical element information...
 		for(i = 0; i < regionCount; i++)
 		{
 			
@@ -3134,7 +3134,7 @@ void msImageProcessor::DefineBoundaries( void )
 	//***********************************************************************
 	//***********************************************************************
 
-   // dealocate local used memory
+   // deallocate local used memory
  	delete [] boundaryMap;
    delete [] boundaryCount;
 	delete [] boundaryBuffer;
@@ -3192,7 +3192,7 @@ bool msImageProcessor::InWindow(int mode1, int mode2)
 /*******************************************************/
 /*Square Distance                                      */
 /*******************************************************/
-/*Computs the normalized square distance between two   */
+/*Computes the normalized square distance between two  */
 /*modes.                                               */
 /*******************************************************/
 /*Pre:                                                 */
@@ -4623,7 +4623,7 @@ void msImageProcessor::NewNonOptimizedFilter(float sigmaS, float sigmaR)
          else
             mvAbs += Mh[2]*Mh[2]*sigmaR*sigmaR;
 
-			// Increment interation count
+			// Increment iteration count
 			iterationCount++;
 		}
 
diff --git a/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.h b/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.h
index 60d805cc7..003f3f481 100644
--- a/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.h
+++ b/lightcrafts/jnisrc/EDISON/segm/msImageProcessor.h
@@ -102,19 +102,19 @@ class msImageProcessor: public MeanShift {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|				  * Define Image *                   |//
+  //|	Method Name:								               |//
+  //|   ============								               |//
+  //|				  * Define Image *                        |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Uploads an image to be segmented by the image    |//
   //|   segmenter class.                                 |//
   //|                                                    |//
-  //|   An image is defined by specifying the folloing:  |//
+  //|   An image is defined by specifying the following: |//
   //|                                                    |//
   //|   <* data *>                                       |//
   //|   A one dimensional unsigned char array of RGB     |//
@@ -136,9 +136,9 @@ class msImageProcessor: public MeanShift {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
-  //|		DefineImage(data, type, height, width)       |//
+  //|	Usage:                                             |//
+  //| ======                                             |//
+  //|		DefineImage(data, type, height, width)          |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
@@ -154,18 +154,18 @@ class msImageProcessor: public MeanShift {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|			     * Set Weight Map *                  |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
+  //|			     * Set Weight Map *                      |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Uploads weight map specifying for each pixel     |//
   //|   in the image a value between 0 and 1 - 1 indica- |//
-  //|   ting the presence of an edge and 0 the absense   |//
+  //|   ting the presence of an edge and 0 the absence   |//
   //|   of an edge.                                      |//
   //|                                                    |//
   //|   The arguments to this method are:                |//
@@ -186,9 +186,9 @@ class msImageProcessor: public MeanShift {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
-  //|		SetWeightMap(weightMap, epsilon)             |//
+  //|	Usage:                                             |//
+  //|   ======                                           |//
+  //|		SetWeightMap(weightMap, epsilon)                |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
diff --git a/lightcrafts/jnisrc/EDISON/segm/msSys.cpp b/lightcrafts/jnisrc/EDISON/segm/msSys.cpp
index 2520e3e6c..f40154b35 100644
--- a/lightcrafts/jnisrc/EDISON/segm/msSys.cpp
+++ b/lightcrafts/jnisrc/EDISON/segm/msSys.cpp
@@ -145,13 +145,13 @@ double msSystem::ElapsedTime( void )
 /*Output a text message to the user.                   */
 /*******************************************************/
 /*Pre:                                                 */
-/*      - PromptStr is a string containing delimeters  */
+/*      - PromptStr is a string containing delimiters  */
 /*        that is to be output to the user.            */
 /*      - a variable set of arguments is also passed   */
 /*        to this method that are used to replace      */
-/*        the delimeters contained by PromptStr        */
+/*        the delimiters contained by PromptStr        */
 /*Post:                                                */
-/*      - the delimeters of PromptStr have been        */
+/*      - the delimiters of PromptStr have been        */
 /*        replaced accordingly using the variable      */
 /*        set of arguments and the resulting string    */
 /*        has been output to the user.                 */
diff --git a/lightcrafts/jnisrc/EDISON/segm/msSys.h b/lightcrafts/jnisrc/EDISON/segm/msSys.h
index f17c4838f..ca59e3ed2 100644
--- a/lightcrafts/jnisrc/EDISON/segm/msSys.h
+++ b/lightcrafts/jnisrc/EDISON/segm/msSys.h
@@ -20,7 +20,7 @@
 	is desired.
 
 	The prototype for the mean shift system class is provided
-	below. Its defition is provided in "msSys.cc".
+	below. Its definition is provided in "msSys.cc".
 
 The theory is described in the papers:
 
@@ -66,14 +66,14 @@ class msSystem {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|				  *  Start Timer  *                  |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
+  //|				  *  Start Timer  *                          |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Initializes the system timer. The timer object   |//
   //|   synthesized by this class is initialized during  |//
@@ -88,14 +88,14 @@ class msSystem {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|				 *  Elapsed Time  *                  |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
+  //|				 *  Elapsed Time  *                          |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Returns the amount of time elapsed in seconds    |//
   //|   from when StartTimer() was called. If            |//
@@ -104,13 +104,13 @@ class msSystem {
   //|   msSystem object.                                 |//
   //|                                                    |//
   //|   In order to create a valid kernel the following  |//
-  //|   argumens must be provided this method:           |//
+  //|   arguments must be provided this method:          |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
-  //|		TimeInSeconds = ElapsedTime()                |//
+  //|	Usage:                                             |//
+  //| ======                                             |//
+  //|		TimeInSeconds = ElapsedTime()                    |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
@@ -124,17 +124,17 @@ class msSystem {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|				     *  Prompt  *                    |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
+  //|				     *  Prompt  *                            |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   Outputs to a device a character message contain- |//
-  //|   ing delimeters. These delimeters are replaced by |//
+  //|   ing delimiters. These delimiters are replaced by |//
   //|   the variable input parameters passed to prompt.  |//
   //|   (Like printf.)                                   |//
   //|                                                    |//
@@ -145,7 +145,7 @@ class msSystem {
   //|   The arguments to this method are:                |//
   //|                                                    |//
   //|   <* PromptStr *>                                  |//
-  //|   A string possibly containing delimeters that     |//
+  //|   A string possibly containing delimiters that     |//
   //|   is to be output to the user.                     |//
   //|                                                    |//
   //|   <* varArgs *>                                    |//
@@ -154,9 +154,9 @@ class msSystem {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
-  //|		Prompt(PromptStr, varArgs)                   |//
+  //|	Usage:                                             |//
+  //| ======                                             |//
+  //|		Prompt(PromptStr, varArgs)                       |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
@@ -166,20 +166,20 @@ class msSystem {
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Method Name:								     |//
-  //|   ============								     |//
-  //|				   *  Progress  *                    |//
+  //|	Method Name:                                       |//
+  //| ============                                       |//
+  //|				   *  Progress  *                            |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Description:								     |//
-  //|	============								     |//
+  //|	Description:                                       |//
+  //|	============                                       |//
   //|                                                    |//
   //|   This method is called by the mean shift library  |//
   //|   methods during the application of a specific     |//
   //|   algorithm in which the progress of the algorithm |//
   //|   is indicated. Its main use is for a multi-thre-  |//
-  //|   aded programming envioronment. Namely, it is     |//
+  //|   aded programming environment. Namely, it is      |//
   //|   called fairly frequently by the mean shift       |//
   //|   library methods. It then can be used to grace-   |//
   //|   fully halt the algorithm, or to simply update    |//
@@ -189,7 +189,7 @@ class msSystem {
   //|   and therefore must be re-implemented to accom-   |//
   //|   odate ones needs.                                |//
   //|                                                    |//
-  //|   To facilitate a multi-threaded enviornment       |//
+  //|   To facilitate a multi-threaded environment       |//
   //|   the prompt function returns a value that         |//
   //|   indicates to the mean shift method whether       |//
   //|   to continue execution. EL_HALT is returned       |//
@@ -210,9 +210,9 @@ class msSystem {
   //|                                                    |//
   //<--------------------------------------------------->|//
   //|                                                    |//
-  //|	Usage:      								     |//
-  //|   ======      								     |//
-  //|	 SystemState = Progress(PercentComplete)         |//
+  //|	Usage:                                             |//
+  //| ======                                             |//
+  //|	 SystemState = Progress(PercentComplete)           |//
   //|                                                    |//
   //<--------------------------------------------------->|//
   //--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//--\\||//
diff --git a/lightcrafts/jnisrc/EDISON/segm/msSysPrompt.cpp b/lightcrafts/jnisrc/EDISON/segm/msSysPrompt.cpp
index d7cc487e3..fb6623cc6 100644
--- a/lightcrafts/jnisrc/EDISON/segm/msSysPrompt.cpp
+++ b/lightcrafts/jnisrc/EDISON/segm/msSysPrompt.cpp
@@ -167,13 +167,13 @@ double msSystem::ElapsedTime( void )
 /*Output a text message to the user.                   */
 /*******************************************************/
 /*Pre:                                                 */
-/*      - PromptStr is a string containing delimeters  */
+/*      - PromptStr is a string containing delimiters  */
 /*        that is to be output to the user.            */
 /*      - a variable set of arguments is also passed   */
 /*        to this method that are used to replace      */
-/*        the delimeters contained by PromptStr        */
+/*        the delimiters contained by PromptStr        */
 /*Post:                                                */
-/*      - the delimeters of PromptStr have been        */
+/*      - the delimiters of PromptStr have been        */
 /*        replaced accordingly using the variable      */
 /*        set of arguments and the resulting string    */
 /*        has been output to the user.                 */
diff --git a/lightcrafts/jnisrc/EDISON/segm/rlist.h b/lightcrafts/jnisrc/EDISON/segm/rlist.h
index 30e7d39d5..2982820ca 100644
--- a/lightcrafts/jnisrc/EDISON/segm/rlist.h
+++ b/lightcrafts/jnisrc/EDISON/segm/rlist.h
@@ -129,7 +129,7 @@ class RegionList {
   //|                                                    |//
   //|   <* indeces *>                                    |//
   //|   An integer array that specifies the set of ind-  |//
-  //|   eces of the data points that are contianed with- |//
+  //|   eces of the data points that are contained with- |//
   //|   in this region.                                  |//
   //|                                                    |//
   //<--------------------------------------------------->|//
diff --git a/lightcrafts/jnisrc/EDISON/segm/tdef.h b/lightcrafts/jnisrc/EDISON/segm/tdef.h
index fe3edf05b..6216da056 100644
--- a/lightcrafts/jnisrc/EDISON/segm/tdef.h
+++ b/lightcrafts/jnisrc/EDISON/segm/tdef.h
@@ -8,10 +8,10 @@
 	the necessary output will be generated needed
 	to analyze a given input set of data.
 
-  Type Defintions:
-  ===============
+  Type Definitions:
+  ================
 
-	This header file contains the type defintions and
+	This header file contains the type definitions and
 	enumerations shared among the various classes of the mean
 	shift library.
 
diff --git a/lightcrafts/jnisrc/fast_bilateral/include/array.h b/lightcrafts/jnisrc/fast_bilateral/include/array.h
index 9d998d2fe..99063b7b4 100644
--- a/lightcrafts/jnisrc/fast_bilateral/include/array.h
+++ b/lightcrafts/jnisrc/fast_bilateral/include/array.h
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
  *  This file contains code made by Sylvain Paris under supervision of
- * François Sillion for his PhD work with <a
+ * Fran�ois Sillion for his PhD work with <a
  * href="http://www-artis.imag.fr">ARTIS project</a>. ARTIS is a
  * research project in the GRAVIR/IMAG laboratory, a joint unit of
  * CNRS, INPG, INRIA and UJF.
@@ -140,7 +140,7 @@ class Array_2D{
   inline Array_2D(const Array_2D<T,A>& a);
   //@}
 
-  //! Assignement of a default value.
+  //! Assignment of a default value.
   void assign(const size_type nx,
 	      const size_type ny,
 	      const T& val);
@@ -350,7 +350,7 @@ class Array_3D{
   inline Array_3D(const Array_3D<T,A>& a);
   //@}
 
-  //! Assignement of a default value.
+  //! Assignment of a default value.
   void assign(const size_type nx,
 	      const size_type ny,
 	      const size_type nz,
diff --git a/lightcrafts/jnisrc/fast_bilateral/include/array_n.h b/lightcrafts/jnisrc/fast_bilateral/include/array_n.h
index f953306c8..f900cfed9 100644
--- a/lightcrafts/jnisrc/fast_bilateral/include/array_n.h
+++ b/lightcrafts/jnisrc/fast_bilateral/include/array_n.h
@@ -1,9 +1,9 @@
-/* Copyright (C) 2005-2011 Fabio Riccardi */
-
+/* Copyright (C) 2005-2011 Fabio Riccardi */
+
 /*! \file
   \verbatim
   
-    Copyright (c) 2006, Sylvain Paris and Frédo Durand
+    Copyright (c) 2006, Sylvain Paris and Fr�do Durand
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
@@ -105,7 +105,7 @@ class Array_ND{
   inline Array_ND(const Array_ND<N,T,A>& a);
   //@}
 
-  //! Assignement of a default value.
+  //! Assignment of a default value.
   template<typename Vector_ND>
   void assign(const Vector_ND& size_vector,
 	      const T& val);
diff --git a/lightcrafts/jnisrc/fast_bilateral/include/geom.h b/lightcrafts/jnisrc/fast_bilateral/include/geom.h
index 3b1b01481..583ccd184 100644
--- a/lightcrafts/jnisrc/fast_bilateral/include/geom.h
+++ b/lightcrafts/jnisrc/fast_bilateral/include/geom.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2005-2011 Fabio Riccardi */
-
+/* Copyright (C) 2005-2011 Fabio Riccardi */
+
 /*! \file
 
 \verbatim
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \endverbatim
 
  *  This file contains code made by Sylvain Paris under supervision of
- * François Sillion for his PhD work with <a
+ * Fran�ois Sillion for his PhD work with <a
  * href="http://www-artis.imag.fr">ARTIS project</a>. ARTIS is a
  * research project in the GRAVIR/IMAG laboratory, a joint unit of
  * CNRS, INPG, INRIA and UJF.
@@ -482,7 +482,7 @@ namespace Geometry {
     //@}
 
     //@{
-    //! Access as a non-homogenous 3D entity.
+    //! Access as a non-homogeneous 3D entity.
 
     inline value_type x() const;
     inline value_type y() const;
diff --git a/lightcrafts/jnisrc/fast_bilateral/include/msg_stream.h b/lightcrafts/jnisrc/fast_bilateral/include/msg_stream.h
index b5ae60055..20595ac3b 100644
--- a/lightcrafts/jnisrc/fast_bilateral/include/msg_stream.h
+++ b/lightcrafts/jnisrc/fast_bilateral/include/msg_stream.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2005-2011 Fabio Riccardi */
-
+/* Copyright (C) 2005-2011 Fabio Riccardi */
+
 /*! \file Msg_stream
 
 \verbatim
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \endverbatim
 
  *  This file contains code made by Sylvain Paris under supervision of
- * François Sillion for his PhD work with <a
+ * Fran�ois Sillion for his PhD work with <a
  * href="http://www-artis.imag.fr">ARTIS project</a>. ARTIS is a
  * research project in the GRAVIR/IMAG laboratory, a joint unit of
  * CNRS, INPG, INRIA and UJF.
@@ -79,7 +79,7 @@ class Warning_stream;
 inline Warning_stream& done(Warning_stream& w);
 
 
-//! Class defining an ouput for warnings and errors.
+//! Class defining an output for warnings and errors.
 class Warning_stream{
     
 public:
diff --git a/lightcrafts/jnisrc/include/simde/simde-align.h b/lightcrafts/jnisrc/include/simde/simde-align.h
index 0c8a809ee..c37f8c847 100644
--- a/lightcrafts/jnisrc/include/simde/simde-align.h
+++ b/lightcrafts/jnisrc/include/simde/simde-align.h
@@ -11,8 +11,8 @@
  **********************************************************************
  *
  * This is portability layer which should help iron out some
- * differences across various compilers, as well as various verisons of
- * C and C++.
+ * differences across various compilers, as well as various versions
+ * of C and C++.
  *
  * It was originally developed for SIMD Everywhere
  * (<https://github.com/simd-everywhere/simde>), but since its only
@@ -55,7 +55,7 @@
 #include "hedley.h"
 
 /* I know this seems a little silly, but some non-hosted compilers
- * don't have stddef.h, so we try to accomodate them. */
+ * don't have stddef.h, so we try to accommodate them. */
 #if !defined(SIMDE_ALIGN_SIZE_T_)
   #if defined(__SIZE_TYPE__)
     #define SIMDE_ALIGN_SIZE_T_ __SIZE_TYPE__
@@ -405,7 +405,7 @@
 
 /* SIMDE_ALIGN_ASSUME_LIKE(Pointer, Type)
  *
- * Tihs is similar to SIMDE_ALIGN_ASSUME_TO, except that it takes a
+ * This is similar to SIMDE_ALIGN_ASSUME_TO, except that it takes a
  * type instead of a numeric value. */
 #if defined(SIMDE_ALIGN_OF) && defined(SIMDE_ALIGN_ASSUME_TO)
   #define SIMDE_ALIGN_ASSUME_LIKE(Pointer, Type) SIMDE_ALIGN_ASSUME_TO(Pointer, SIMDE_ALIGN_OF(Type))
diff --git a/lightcrafts/jnisrc/include/simde/simde-complex.h b/lightcrafts/jnisrc/include/simde/simde-complex.h
index ce840e228..48ebe4cf1 100644
--- a/lightcrafts/jnisrc/include/simde/simde-complex.h
+++ b/lightcrafts/jnisrc/include/simde/simde-complex.h
@@ -26,7 +26,7 @@
 
 /* Support for complex math.
  *
- * We try to avoid inculding <complex> (in C++ mode) since it pulls in
+ * We try to avoid including <complex> (in C++ mode) since it pulls in
  * a *lot* of code.  Unfortunately this only works for GNU modes (i.e.,
  * -std=gnu++14 not -std=c++14) unless you pass -fext-numeric-literals,
  * but there is no way (AFAICT) to detect that flag so we have to rely
diff --git a/lightcrafts/jnisrc/include/simde/simde-constify.h b/lightcrafts/jnisrc/include/simde/simde-constify.h
index 94a9d3897..31803bf60 100644
--- a/lightcrafts/jnisrc/include/simde/simde-constify.h
+++ b/lightcrafts/jnisrc/include/simde/simde-constify.h
@@ -37,7 +37,7 @@
  * constant.
  *
  * As long as the value you pass to the function in constant, pretty
- * much any copmiler shouldn't have a problem generating exactly the
+ * much any compiler shouldn't have a problem generating exactly the
  * same code as if you had used an ICE.
  *
  * This is intended to be used in the SIMDe implementations of
diff --git a/lightcrafts/jnisrc/include/simde/simde-diagnostic.h b/lightcrafts/jnisrc/include/simde/simde-diagnostic.h
index a525d3a2a..6c7d2e732 100644
--- a/lightcrafts/jnisrc/include/simde/simde-diagnostic.h
+++ b/lightcrafts/jnisrc/include/simde/simde-diagnostic.h
@@ -272,7 +272,7 @@
   #define SIMDE_DIAGNOSTIC_DISABLE_CAST_FUNCTION_TYPE_
 #endif
 
-/* clang will emit this warning when we use C99 extensions whan not in
+/* clang will emit this warning when we use C99 extensions when not in
  * C99 mode, even though it does support this.  In such cases we check
  * the compiler and version first, so we know it's not a problem. */
 #if HEDLEY_HAS_WARNING("-Wc99-extensions")
diff --git a/lightcrafts/jnisrc/include/simde/simde-f16.h b/lightcrafts/jnisrc/include/simde/simde-f16.h
index be5ebeacc..92f646ba2 100644
--- a/lightcrafts/jnisrc/include/simde/simde-f16.h
+++ b/lightcrafts/jnisrc/include/simde/simde-f16.h
@@ -57,7 +57,7 @@ SIMDE_BEGIN_DECLS_
  * that on Arm since it would break compatibility with the NEON F16
  * functions. */
 #define SIMDE_FLOAT16_API_FP16_NO_ABI 3
-/* This is basically __fp16 as specified by Arm, where arugments and
+/* This is basically __fp16 as specified by Arm, where arguments and
  * return values are raw __fp16 values not structs. */
 #define SIMDE_FLOAT16_API_FP16 4
 
diff --git a/lightcrafts/jnisrc/include/simde/x86/avx512/xorsign.h b/lightcrafts/jnisrc/include/simde/x86/avx512/xorsign.h
index 38fb5f942..f7fdc8c97 100644
--- a/lightcrafts/jnisrc/include/simde/x86/avx512/xorsign.h
+++ b/lightcrafts/jnisrc/include/simde/x86/avx512/xorsign.h
@@ -26,7 +26,7 @@
  */
 
 /* This is a SIMDe extension which is not part of AVX-512.  It exists
- * because a lot of numerical methods in SIMDe have algoriths which do
+ * because a lot of numerical methods in SIMDe have algorithms which do
  * something like:
  *
  *   float sgn = input < 0 ? -1 : 1;
diff --git a/lightcrafts/jnisrc/include/simde/x86/sse.h b/lightcrafts/jnisrc/include/simde/x86/sse.h
index ed42e9bbd..0a5798f6b 100644
--- a/lightcrafts/jnisrc/include/simde/x86/sse.h
+++ b/lightcrafts/jnisrc/include/simde/x86/sse.h
@@ -777,7 +777,7 @@ simde_mm_move_ss (simde__m128 a, simde__m128 b) {
 SIMDE_FUNCTION_ATTRIBUTES
 simde__m128
 simde_x_mm_broadcastlow_ps(simde__m128 a) {
-  /* This function broadcasts the first element in the inpu vector to
+  /* This function broadcasts the first element in the input vector to
    * all lanes.  It is used to avoid generating spurious exceptions in
    * *_ss functions since there may be garbage in the upper lanes. */
 
diff --git a/lightcrafts/misc/engdoc/LightZone Engineering Release Notes.html b/lightcrafts/misc/engdoc/LightZone Engineering Release Notes.html
index 9fc233225..49d8c1e05 100644
--- a/lightcrafts/misc/engdoc/LightZone Engineering Release Notes.html	
+++ b/lightcrafts/misc/engdoc/LightZone Engineering Release Notes.html	
@@ -966,7 +966,7 @@ <h3>Other changes (Windows only)</h3>
 
     <h2>Changes for 2.0.2</h2>
 
-    <h3>Fixes (all platorms)</h3>
+    <h3>Fixes (all platforms)</h3>
     <ul>
       <li>
         Overall performance has improved for caching image data.
diff --git a/lightcrafts/mk/platform.mk b/lightcrafts/mk/platform.mk
index 6a2f11ae2..fdf25b477 100644
--- a/lightcrafts/mk/platform.mk
+++ b/lightcrafts/mk/platform.mk
@@ -34,7 +34,7 @@ endif
 
 TOOLS_BIN:=		$(abspath $(ROOT)/lightcrafts/tools/bin)
 
-# Default to a normal (Unix) classpath seperator.
+# Default to a normal (Unix) classpath separator.
 CLASSPATH_SEP:=		:
 
 # The default C and C++ compilers for Linux, FreeBSD, or OpenIndiana
diff --git a/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.codecimpl.properties b/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.codecimpl.properties
index c40e9bd47..2f2ec8baf 100644
--- a/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.codecimpl.properties
+++ b/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.codecimpl.properties
@@ -69,8 +69,8 @@ PNGImageDecoder21=IOException occurs when get a chunk.
 
 PNMImageDecoder0=Invalid magic value for PBM/PGM/PPM file.
 PNMImageDecoder1=Unrecognized file variant.
-PNMImageDecoder2=IOException occured while reading PNM file header.
-PNMImageDecoder3=IOException occured while processing PNM file.
+PNMImageDecoder2=IOException occurred while reading PNM file header.
+PNMImageDecoder3=IOException occurred while processing PNM file.
 PNMImageDecoder4=Illegal tile requested from a PNMImage.
 PNMImageDecoder5=Illegal page requested from a PNM file.
 PNMImageDecoder6=IOException occurs when read the image header.
@@ -107,7 +107,7 @@ TIFFImage9=-bit samples are not supported for Horizontal differencing Predictor.
 TIFFImage10=Unsupported compression type.
 TIFFImage11=Colormap must be present for a Palette Color image.
 TIFFImage12=Illegal tile requested from a TIFFImage.
-TIFFImage13=IOException occured while reading TIFF image data.
+TIFFImage13=IOException occurred while reading TIFF image data.
 TIFFImage14=Unable to decode Packbits compressed data - not enough data.
 TIFFImage15=Decoding of old style JPEG-in-TIFF data is not supported.
 TIFFImage16=JPEG-in-TIFF decoding supported only for 8-bit samples and either 1 (grayscale or palette-color) or 3 (RGB or YCbCr) samples per pixel.
diff --git a/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.opimage.properties b/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.opimage.properties
index 753cf52e3..b0dfa00a5 100644
--- a/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.opimage.properties
+++ b/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.media.jai.opimage.properties
@@ -11,7 +11,7 @@
 #
 Generic0=The input argument(s) may not be null.
 Generic1=The sourceIndex must be non-negative and less than the number of sources this image has.
-Generic3=Unkown data type.
+Generic3=Unknown data type.
 
 AWTImageOpImage0=InterruptedException occurred while loading the AWT image using MediaTracker.
 AWTImageOpImage1=MediaTracker is unable to load the AWT image.
diff --git a/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.mediax.jai.remote.properties b/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.mediax.jai.remote.properties
index 770908203..152d5a8e9 100644
--- a/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.mediax.jai.remote.properties
+++ b/lightcrafts/resources/com/lightcrafts/mediax/jai/com.lightcrafts.mediax.jai.remote.properties
@@ -113,7 +113,7 @@ SerializableRenderedImage13=IOException occurs when write the close message.
 SerializableRenderedImage14=IOException occurs when create the socket.
 SerializableRenderedImage15=IOException occurs when encode a tile.
 SerializableRenderedImage16=IOException occurs when decode a tile.
-SerializableRenderedImage17=IOException occured when writing CLOSE_ACK object.
+SerializableRenderedImage17=IOException occurred when writing CLOSE_ACK object.
 
 UseTileCodec0=The format name in the encoding parameter should be the same as the provided one.
 UseTileCodec1=The format name in the decoding parameter should be the same as the provided one.
diff --git a/lightcrafts/src/com/lightcrafts/app/Application.java b/lightcrafts/src/com/lightcrafts/app/Application.java
index 00de88d64..5e3d6d8aa 100644
--- a/lightcrafts/src/com/lightcrafts/app/Application.java
+++ b/lightcrafts/src/com/lightcrafts/app/Application.java
@@ -1945,7 +1945,7 @@ private static void savePrefs() {
         if (LastSaveOptions != null) {
             // We're remembering the whole SaveOptions object, but
             // SaveOptions.getDefaultSaveOptions() is the authoritative
-            // reposity for sticky options.  The LastSaveOptions is only
+            // repository for sticky options.  The LastSaveOptions is only
             // used to remember the recent folder.
             XmlDocument doc = new XmlDocument(SaveTag);
             LastSaveOptions.save(doc.getRoot());
diff --git a/lightcrafts/src/com/lightcrafts/app/CheckForUpdate.java b/lightcrafts/src/com/lightcrafts/app/CheckForUpdate.java
index 6469b49e4..1d8ad308a 100755
--- a/lightcrafts/src/com/lightcrafts/app/CheckForUpdate.java
+++ b/lightcrafts/src/com/lightcrafts/app/CheckForUpdate.java
@@ -61,7 +61,7 @@ public static void checkNowAndWait() {
         }
 
         //
-        // Second, check to see if we previosuly determined that an update was
+        // Second, check to see if we previously determined that an update was
         // available.  If so, we don't need to check again.
         //
         if ( isUpdateAvailable( true ) ) {
@@ -129,7 +129,7 @@ public static void start() {
             return;
 
         //
-        // Second, check to see if we previosuly determined that an update was
+        // Second, check to see if we previously determined that an update was
         // available.  If so, we don't need to check again.
         //
         if ( isUpdateAvailable( false ) )
@@ -138,7 +138,7 @@ public static void start() {
         //
         // Finally, check to see if an update is available.  Since this
         // involves internet access, it could potentially take a while.  Hence,
-        // spawn this part in a seperate thread and return now.
+        // spawn this part in a separate thread and return now.
         //
         new BackgroundCheckThread().start();
     }
@@ -356,7 +356,7 @@ private static boolean shouldCheckForUpdate() {
 
     /**
      * Shows an alert to the user indicating that a new version is available.
-     * This method is used by the synchronous check mechamism.
+     * This method is used by the synchronous check mechanism.
      */
     private static void showDownloadNowOrCancelAlert() {
         final AlertDialog alert = Platform.getPlatform().getAlertDialog();
diff --git a/lightcrafts/src/com/lightcrafts/app/batch/BatchConfigurator.java b/lightcrafts/src/com/lightcrafts/app/batch/BatchConfigurator.java
index a9c2cdbea..9701e05ba 100644
--- a/lightcrafts/src/com/lightcrafts/app/batch/BatchConfigurator.java
+++ b/lightcrafts/src/com/lightcrafts/app/batch/BatchConfigurator.java
@@ -10,7 +10,7 @@
 import java.io.File;
 
 /**
- * This conducts the dialog that must preceed TemplateApplicator.  It lets a
+ * This conducts the dialog that must precede TemplateApplicator.  It lets a
  * user confirm the list of files that will be processed, set a flag to
  * specify whether files should be created or overwritten, and if files will
  * be created, it also lets the user specify a name pattern for the new
diff --git a/lightcrafts/src/com/lightcrafts/image/color/ColorMatrix2.java b/lightcrafts/src/com/lightcrafts/image/color/ColorMatrix2.java
index d54e4914a..57997e613 100644
--- a/lightcrafts/src/com/lightcrafts/image/color/ColorMatrix2.java
+++ b/lightcrafts/src/com/lightcrafts/image/color/ColorMatrix2.java
@@ -15,7 +15,7 @@ public class ColorMatrix2 {
 
     /*
     *	matrixmult -
-    *		multiply two matricies
+    *		multiply two matrices
     */
     static void matrixmult(float[][] a, float[][] b, float[][] c) {
         int x, y;
@@ -45,7 +45,7 @@ public static void xformpnt(float[][] matrix, float[] in, float[] out) {
 
     /*
     *	cscalemat -
-    *		make a color scale marix
+    *		make a color scale matrix
     */
     public static void cscalemat(float[][] mat, float rscale, float gscale, float bscale) {
         float[][] mmat = new float[4][4];
@@ -75,7 +75,7 @@ public static void cscalemat(float[][] mat, float rscale, float gscale, float bs
 
     /*
     *	lummat -
-    *		make a luminance marix
+    *		make a luminance matrix
     */
     public static void lummat(float[][] mat) {
         float[][] mmat = new float[4][4];
@@ -108,7 +108,7 @@ public static void lummat(float[][] mat) {
 
     /*
     *	saturatemat -
-    *		make a saturation marix
+    *		make a saturation matrix
     */
     public static void saturatemat(float[][] mat, float sat) {
         float[][] mmat = new float[4][4];
diff --git a/lightcrafts/src/com/lightcrafts/image/color/ColorProfileInfo.java b/lightcrafts/src/com/lightcrafts/image/color/ColorProfileInfo.java
index c28a7adec..31e3edebf 100644
--- a/lightcrafts/src/com/lightcrafts/image/color/ColorProfileInfo.java
+++ b/lightcrafts/src/com/lightcrafts/image/color/ColorProfileInfo.java
@@ -42,7 +42,7 @@ public ColorProfileInfo( String name, String path ) {
      * to arrange.
      * @return Returns a {@link List} of the color profiles arranged for
      * display in a menu.  Entries that are <code>null</code> indicate where a
-     * menu seperator should be.
+     * menu separator should be.
      */
     public static List<ColorProfileInfo>
     arrangeForMenu( Collection<ColorProfileInfo> profiles ) {
diff --git a/lightcrafts/src/com/lightcrafts/image/color/ColorScience.java b/lightcrafts/src/com/lightcrafts/image/color/ColorScience.java
index 4dd1659e0..b213b6e68 100644
--- a/lightcrafts/src/com/lightcrafts/image/color/ColorScience.java
+++ b/lightcrafts/src/com/lightcrafts/image/color/ColorScience.java
@@ -221,7 +221,7 @@ The representation of the colors in the RGB and CMY(K) color spaces are designed
 
             Hue = (Alpha-arctan((Red-intensity)*(3^0.5)/(Green-Blue)))/(2*PI)
             with { Alpha=PI/2 if Green>Blue
-                 { Aplha=3*PI/2 if Green<Blue
+                 { Alpha=3*PI/2 if Green<Blue
                  { Hue=1 if Green=Blue
             Saturation = (Red^2+Green^2+Blue^2-Red*Green-Red*Blue-Blue*Green)^0.5
             Intensity = (Red+Green+Blue)/3
diff --git a/lightcrafts/src/com/lightcrafts/image/export/ResolutionOption.java b/lightcrafts/src/com/lightcrafts/image/export/ResolutionOption.java
index 923a4e41f..eae90514e 100644
--- a/lightcrafts/src/com/lightcrafts/image/export/ResolutionOption.java
+++ b/lightcrafts/src/com/lightcrafts/image/export/ResolutionOption.java
@@ -4,7 +4,7 @@
 
 /**
  * A <code>ResolutionOption</code> is-an {@link IntegerExportOption} for
- * storing the number of pixels per unit measurment for an image.
+ * storing the number of pixels per unit measurement for an image.
  *
  * @author Paul J. Lucas [paul@lightcrafts.com]
  */
diff --git a/lightcrafts/src/com/lightcrafts/image/libs/LCJPEGWriter.java b/lightcrafts/src/com/lightcrafts/image/libs/LCJPEGWriter.java
index a5db15e2f..06265c02a 100644
--- a/lightcrafts/src/com/lightcrafts/image/libs/LCJPEGWriter.java
+++ b/lightcrafts/src/com/lightcrafts/image/libs/LCJPEGWriter.java
@@ -183,7 +183,7 @@ public void putImage(RenderedImage image, ProgressThread thread)
             if (bands == 4 /* CMYK */) {
                 //
                 // Write a mimicked APPE segment so 3rd-party applications that
-                // read CYMK JPEG images will think the creator is Photoshop
+                // read CMYK JPEG images will think the creator is Photoshop
                 // and thus know to invert the image data.
                 //
                 writeAdobeSegment(ADOBE_CTT_UNKNOWN);
diff --git a/lightcrafts/src/com/lightcrafts/image/libs/LibRaw.java b/lightcrafts/src/com/lightcrafts/image/libs/LibRaw.java
index 6d6d4069c..a61468878 100644
--- a/lightcrafts/src/com/lightcrafts/image/libs/LibRaw.java
+++ b/lightcrafts/src/com/lightcrafts/image/libs/LibRaw.java
@@ -201,7 +201,7 @@ private static String undupMakeModel(String make, String model) {
                 // word "Corporation" in it, e.g., "Nikon Corporation", so this
                 // kind of make won't be in the model.
                 // However, if the make contains the first word of the model,
-                // e.g., "Nikon Coproration" contains "Nikon" (the first word
+                // e.g., "Nikon Corporation" contains "Nikon" (the first word
                 // of "Nikon D2X"), then just return the model.
                 return model;
             }
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/CIFFMetadataReader.java b/lightcrafts/src/com/lightcrafts/image/metadata/CIFFMetadataReader.java
index 5baa663a0..5267052eb 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/CIFFMetadataReader.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/CIFFMetadataReader.java
@@ -205,7 +205,7 @@ private boolean readDirectoryEntry( int blockOffset, int offset,
      *
      * @param offset The offset of the first character.
      * @param length The length of the string.
-     * @return Returns the make and model seperated by a <code>null</code>
+     * @return Returns the make and model separated by a <code>null</code>
      * byte.
      * @see {@link CIFFTags#CIFF_MAKE_MODEL}
      */
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/CIFFTags.java b/lightcrafts/src/com/lightcrafts/image/metadata/CIFFTags.java
index 7f17454fe..796d629c1 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/CIFFTags.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/CIFFTags.java
@@ -740,7 +740,7 @@ public interface CIFFTags extends ImageMetaTags {
     int CIFF_JPG_FROM_RAW                   = CIFF_FIELD_TYPE_MIXED | 0x07;
 
     /**
-     * The camera model-name as two null-terminated stings, with an additional
+     * The camera model-name as two null-terminated strings, with an additional
      * null at the end: the first is the manufacturer name (e.g.,
      * &quot;Canon&quot;) and the next is the model name (e.g., &quot;PowerShot
      * ver1.00&quot;), followed by a null.  There will therefore be a total of
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/EXIFEncoder.java b/lightcrafts/src/com/lightcrafts/image/metadata/EXIFEncoder.java
index af383392e..54c1bc328 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/EXIFEncoder.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/EXIFEncoder.java
@@ -490,7 +490,7 @@ private static boolean skipTag( int tagID ) {
     private final ImageMetadata m_metadata;
 
     /**
-     * EXIF metadata values larger than 4 bytes are stored seperately past all
+     * EXIF metadata values larger than 4 bytes are stored separately past all
      * the directory entries.  This is used to keep track of the next available
      * position for such a value.
      */
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/IPTCDirectory.java b/lightcrafts/src/com/lightcrafts/image/metadata/IPTCDirectory.java
index e7c8d4a40..7393ebe19 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/IPTCDirectory.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/IPTCDirectory.java
@@ -266,7 +266,7 @@ public String valueToString( ImageMetaValue value ) {
             case IPTC_EXPIRATION_DATE:
             case IPTC_RELEASE_DATE: {
                 //
-                // IPTC dates don't have times (those are stored seperately --
+                // IPTC dates don't have times (those are stored separately --
                 // see below), so we chop off the "00:00:00" from the Date
                 // value.
                 //
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTagInfo.java b/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTagInfo.java
index 414aecd44..a544a0350 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTagInfo.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTagInfo.java
@@ -21,7 +21,7 @@ public final class IPTCTagInfo extends ImageMetaTagInfo {
     public static final int IPTC_TAG_MULTILINE  = 0x0001;
 
     /**
-     * Tag atrribute: multi-value.
+     * Tag attribute: multi-value.
      * <p>
      * If a tag has this attribute, it allows multiple values, e.g., keywords.
      */
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTags.java b/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTags.java
index 9208c5ec4..db608ae9b 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTags.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/IPTCTags.java
@@ -279,7 +279,7 @@ public interface IPTCTags extends ImageMetaTags {
     int IPTC_OBJECT_CYCLE                       = IPTC_RECORD_APP << 8 | 0x4B;
 
     /**
-     * A shorthand reference for the news object. While a technical identifer
+     * A shorthand reference for the news object. While a technical identifier
      * goes to an identifier element, Title holds a short verbal and human
      * readable name. Title is not the same as {@link #IPTC_HEADLINE}.
      * <p>
@@ -338,7 +338,7 @@ public interface IPTCTags extends ImageMetaTags {
     int IPTC_RECORD_VERSION                     = IPTC_RECORD_APP << 8;
 
     /**
-     * The release date of the news obejct.
+     * The release date of the news object.
      * <p>
      * Type: ASCII.
      */
@@ -520,7 +520,7 @@ public interface IPTCTags extends ImageMetaTags {
     int IPTC_RIGHTS_USAGE_TERMS                 = 0xF204;
 
     /**
-     * Describes the scene of a photo content. Specifies one ore more terms
+     * Describes the scene of a photo content. Specifies one or more terms
      * from the IPTC "Scene-NewsCodes". Each Scene is represented as a string
      * of 6 digits in an unordered list.
      * <p>
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadata.java b/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadata.java
index 93c42cb41..9666f4ce0 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadata.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadata.java
@@ -224,7 +224,7 @@ public int getBitsPerChannel() {
      *
      * @param includeModel If <code>true</code>, the model is included.
      * @return Returns the make (and possibly model) converted to uppercase and
-     * seperated by a space or <code>null</code> if not available.
+     * separated by a space or <code>null</code> if not available.
      */
     public final String getCameraMake( boolean includeModel ) {
         final Collection<ImageMetadataDirectory> dirs =
@@ -1167,7 +1167,7 @@ public ImageMetadata prepForXMP( boolean useActualOrientation ) {
      *
      * @param dir The {@link ImageMetadataDirectory} to put.
      * @return Returns the previous {@link ImageMetadataDirectory} or
-     * <code>null</code> if there was no previos directory.
+     * <code>null</code> if there was no previous directory.
      */
     public ImageMetadataDirectory putDirectory( ImageMetadataDirectory dir ) {
         final Class dirClass = dir.getClass();
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadataDirectory.java b/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadataDirectory.java
index fc3c34369..f45931946 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadataDirectory.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/ImageMetadataDirectory.java
@@ -334,7 +334,7 @@ public final Collection<String> getTagValuesFor( int tagID,
      *
      * @param tagID The metadata tag ID (the key).
      * @return Returns the value indexed by the tag ID or <code>null</code> if
-     * there is no value assosiated with the given tag ID.
+     * there is no value associated with the given tag ID.
      * @see #getStaticParent()
      */
     public final synchronized ImageMetaValue getValue( Integer tagID ) {
@@ -943,7 +943,7 @@ protected final void explodeSubfields( int tagID, int startIndex,
      * @param modelTagID The tag ID for the model.
      * @param includeModel If <code>true</code>, the model is included.
      * @return Returns the make (and possibly model) converted to uppercase and
-     * seperated by a space or <code>null</code> if not available.
+     * separated by a space or <code>null</code> if not available.
      */
     protected final String getCameraMake( int makeTagID, int modelTagID,
                                           boolean includeModel ) {
@@ -1138,7 +1138,7 @@ protected Collection<Element> toXMP( Document xmpDoc, String nsURI,
     protected static final int PROVIDER_PRIORITY_MAX = 10000;
 
     /**
-     * The minumum provider priority.
+     * The minimum provider priority.
      * @see #getProviderPriorityFor(Class)
      */
     protected static final int PROVIDER_PRIORITY_MIN = -10000;
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/MetadataUtil.java b/lightcrafts/src/com/lightcrafts/image/metadata/MetadataUtil.java
index 0c2ba8f18..a5051eade 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/MetadataUtil.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/MetadataUtil.java
@@ -152,7 +152,7 @@ else if ( Math.abs( frac - 0.67 ) < 0.05 )
     }
 
     /**
-     * Fixes a given F-Stop value.  F-Stops have discreet &quot;legal&quot;
+     * Fixes a given F-Stop value.  F-Stops have discrete &quot;legal&quot;
      * values.  The returned F-Stop value is one of the legal values that is
      * closest to the given value.
      *
@@ -164,7 +164,7 @@ public static float fixFStop( double fStop ) {
     }
 
     /**
-     * Fixes a given shutter speed value.  Shutter speeds have discreet
+     * Fixes a given shutter speed value.  Shutter speeds have discrete
      * &quot;legal&quot; values.  The returned shutter speed value is one of
      * the legal values that is closest to the given value.
      *
@@ -330,7 +330,7 @@ public static String undupMakeModel( String make, String model ) {
                 // kind of make won't be in the model.
                 //
                 // However, if the make contains the first word of the model,
-                // e.g., "Nikon Coproration" contains "Nikon" (the first word
+                // e.g., "Nikon Corporation" contains "Nikon" (the first word
                 // of "Nikon D2X"), then just return the model.
                 //
                 return model;
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/TIFFTags.java b/lightcrafts/src/com/lightcrafts/image/metadata/TIFFTags.java
index f96088da5..6e03b2885 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/TIFFTags.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/TIFFTags.java
@@ -1107,7 +1107,7 @@ public interface TIFFTags extends ImageMetaTags {
      *        <td align="right" nowrap>4 =&nbsp;</td><td>transparency mask</td>
      *      </tr>
      *      <tr valign="top">
-     *        <td align="right" nowrap>5 =&nbsp;</td><td>seperated (CMYK)</td>
+     *        <td align="right" nowrap>5 =&nbsp;</td><td>separated (CMYK)</td>
      *      </tr>
      *      <tr valign="top">
      *        <td align="right" nowrap>6 =&nbsp;</td><td>YCbCr</td>
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/makernotes/CanonTags.java b/lightcrafts/src/com/lightcrafts/image/metadata/makernotes/CanonTags.java
index a546062eb..8bb920ca2 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/makernotes/CanonTags.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/makernotes/CanonTags.java
@@ -735,7 +735,7 @@ public interface CanonTags extends ImageMetaTags {
         = CANON_CUSTOM_FUNCTIONS << 8 | 0x09;
 
     /**
-     * Custom functions: long exposure noice reduction.
+     * Custom functions: long exposure noise reduction.
      *  <blockquote>
      *    <table border="0" cellpadding="0">
      *      <tr valign="top">
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/providers/MakeModelProvider.java b/lightcrafts/src/com/lightcrafts/image/metadata/providers/MakeModelProvider.java
index 1700c52e7..333a4a15d 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/providers/MakeModelProvider.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/providers/MakeModelProvider.java
@@ -15,7 +15,7 @@ public interface MakeModelProvider extends ImageMetadataProvider {
      *
      * @param includeModel If <code>true</code>, the model is included.
      * @return Returns the make (and possibly model) converted to uppercase and
-     * seperated by a space or <code>null</code> if not available.
+     * separated by a space or <code>null</code> if not available.
      */
     String getCameraMake( boolean includeModel );
 
diff --git a/lightcrafts/src/com/lightcrafts/image/metadata/values/UndefinedMetaValue.java b/lightcrafts/src/com/lightcrafts/image/metadata/values/UndefinedMetaValue.java
index 233cc95fe..0bb713b0c 100644
--- a/lightcrafts/src/com/lightcrafts/image/metadata/values/UndefinedMetaValue.java
+++ b/lightcrafts/src/com/lightcrafts/image/metadata/values/UndefinedMetaValue.java
@@ -153,7 +153,7 @@ protected String[] getValuesImpl() {
     }
 
     /**
-     * Sets the internal byte array to the bytes of the contatenated strings.
+     * Sets the internal byte array to the bytes of the concatenated strings.
      *
      * @param newValue The array of new values.
      */
diff --git a/lightcrafts/src/com/lightcrafts/image/types/AuxiliaryImageInfo.java b/lightcrafts/src/com/lightcrafts/image/types/AuxiliaryImageInfo.java
index c8f485b6e..68c2f4dea 100644
--- a/lightcrafts/src/com/lightcrafts/image/types/AuxiliaryImageInfo.java
+++ b/lightcrafts/src/com/lightcrafts/image/types/AuxiliaryImageInfo.java
@@ -8,7 +8,7 @@
  * An <code>AuxiliaryImageInfo</code> is an abstract base class for classes
  * that need to hold auxiliary information for an image.
  * <p>
- * The reason for having a seperate class for this (as opposed to putting
+ * The reason for having a separate class for this (as opposed to putting
  * auxiliary information directly into {@link ImageInfo}) is because:
  *  <ul>
  *    <li>
diff --git a/lightcrafts/src/com/lightcrafts/image/types/ImageType.java b/lightcrafts/src/com/lightcrafts/image/types/ImageType.java
index e6c58789d..2d54ea7b0 100644
--- a/lightcrafts/src/com/lightcrafts/image/types/ImageType.java
+++ b/lightcrafts/src/com/lightcrafts/image/types/ImageType.java
@@ -67,7 +67,7 @@ public static ImageType determineTypeByExtensionOf( File file ) {
      * <code>'.'</code>).  The extension may be in either upper- or lower-case
      * (or any mixture thereof) because the search is done in a
      * case-insensitive manner.
-     * @return Returns the associatied <code>ImageType</code> or
+     * @return Returns the associated <code>ImageType</code> or
      * <code>null</code> if there is no <code>ImageType</code> uses the given
      * extension.
      */
diff --git a/lightcrafts/src/com/lightcrafts/image/types/JPEGAPPDParser.java b/lightcrafts/src/com/lightcrafts/image/types/JPEGAPPDParser.java
index 2d26aad32..dc0eb6314 100644
--- a/lightcrafts/src/com/lightcrafts/image/types/JPEGAPPDParser.java
+++ b/lightcrafts/src/com/lightcrafts/image/types/JPEGAPPDParser.java
@@ -34,7 +34,7 @@ public static void parse( AdobeResourceParserEventHandler handler,
     {
         try {
             //
-            // A JPEG APPD segment is a set of Adobe resource blocks preceeded
+            // A JPEG APPD segment is a set of Adobe resource blocks preceded
             // by a "Photoshop 3.0" header.
             //
             if ( !buf.getEquals( PHOTOSHOP_3_IDENT, "ASCII" ) ||
diff --git a/lightcrafts/src/com/lightcrafts/image/types/TIFFConstants.java b/lightcrafts/src/com/lightcrafts/image/types/TIFFConstants.java
index 8e37762fe..dbb0e976f 100644
--- a/lightcrafts/src/com/lightcrafts/image/types/TIFFConstants.java
+++ b/lightcrafts/src/com/lightcrafts/image/types/TIFFConstants.java
@@ -448,7 +448,7 @@ public interface TIFFConstants {
     int TIFF_PHOTOMETRIC_TRANSPARENCY   = 4;
 
     /**
-     * TIFF photometric interpretation: seperated.
+     * TIFF photometric interpretation: separated.
      * This is one of the possible values for the
      * {@link TIFFTags#TIFF_PHOTOMETRIC_INTERPRETATION} metadata tag.
      */
diff --git a/lightcrafts/src/com/lightcrafts/jai/operator/UnSharpMaskDescriptor.java b/lightcrafts/src/com/lightcrafts/jai/operator/UnSharpMaskDescriptor.java
index c46abafc9..a613f3bf4 100644
--- a/lightcrafts/src/com/lightcrafts/jai/operator/UnSharpMaskDescriptor.java
+++ b/lightcrafts/src/com/lightcrafts/jai/operator/UnSharpMaskDescriptor.java
@@ -92,7 +92,7 @@ public class UnSharpMaskDescriptor extends OperationDescriptorImpl {
      * The parameter class list for this operation.
      * The number of constants provided should be either 1, in which case
      * this same constant is applied to all the source bands; or the same
-     * number as the source bands, in which case one contant is applied
+     * number as the source bands, in which case one constant is applied
      * to each band.
      */
     private static final Class[] paramClasses = {
diff --git a/lightcrafts/src/com/lightcrafts/jai/opimage/LCColorConvertOpImage.java b/lightcrafts/src/com/lightcrafts/jai/opimage/LCColorConvertOpImage.java
index 359c0efbd..7f9daf160 100644
--- a/lightcrafts/src/com/lightcrafts/jai/opimage/LCColorConvertOpImage.java
+++ b/lightcrafts/src/com/lightcrafts/jai/opimage/LCColorConvertOpImage.java
@@ -106,7 +106,7 @@ private static int getRenderingIntent(ICC_Profile profile) {
     }
 
     /**
-     * Retrive/cache the ColorConvertOp. Because instantiate a ColorConvertOp
+     * Retrieve/cache the ColorConvertOp. Because instantiate a ColorConvertOp
      * is a time-consuming step, create a hashtable referred to by a
      * SoftReference to cache the ColorConvertOp for using repeatedly.
      *
diff --git a/lightcrafts/src/com/lightcrafts/jai/opimage/ShapedMask.java b/lightcrafts/src/com/lightcrafts/jai/opimage/ShapedMask.java
index 34a09c641..5e3c7f6cc 100644
--- a/lightcrafts/src/com/lightcrafts/jai/opimage/ShapedMask.java
+++ b/lightcrafts/src/com/lightcrafts/jai/opimage/ShapedMask.java
@@ -325,7 +325,7 @@ public Raster getData(Rectangle rect) {
 
                 Rectangle scaledBounds = transform.createTransformedShape(maskImage.getBounds()).getBounds();
 
-                // Avoid scaling underflows resulting into exeptions
+                // Avoid scaling underflows resulting into exceptions
                 if (scaledBounds.width < 3 || scaledBounds.height < 3)
                     continue;
 
diff --git a/lightcrafts/src/com/lightcrafts/jai/utils/Functions.java b/lightcrafts/src/com/lightcrafts/jai/utils/Functions.java
index c6d914a48..8094acd5f 100644
--- a/lightcrafts/src/com/lightcrafts/jai/utils/Functions.java
+++ b/lightcrafts/src/com/lightcrafts/jai/utils/Functions.java
@@ -458,7 +458,7 @@ static public KernelJAI getHighPassKernel(double ratio) {
     }
 
     /*
-        Build an ImageLayout that works well with the underlaying OS X Core Graphics engine based on RGB buffers.
+        Build an ImageLayout that works well with the underlying OS X Core Graphics engine based on RGB buffers.
         For some reason Java uses BGR buffers by default that require expensive translations at draw time on the Mac.
     */
 
diff --git a/lightcrafts/src/com/lightcrafts/jai/utils/LCRecyclingTileFactory.java b/lightcrafts/src/com/lightcrafts/jai/utils/LCRecyclingTileFactory.java
index 82fc8c911..183f62f56 100644
--- a/lightcrafts/src/com/lightcrafts/jai/utils/LCRecyclingTileFactory.java
+++ b/lightcrafts/src/com/lightcrafts/jai/utils/LCRecyclingTileFactory.java
@@ -128,7 +128,7 @@ public static void main(String[] args) throws Throwable {
     private HashMap recycledArrays = new HashMap(32);
 
     /**
-     * The amount of memory currrently used for array storage.
+     * The amount of memory currently used for array storage.
      */
     private long memoryUsed = 0L;
 
diff --git a/lightcrafts/src/com/lightcrafts/jai/utils/LCTileScheduler.java b/lightcrafts/src/com/lightcrafts/jai/utils/LCTileScheduler.java
index 7743a7b69..dae46f026 100644
--- a/lightcrafts/src/com/lightcrafts/jai/utils/LCTileScheduler.java
+++ b/lightcrafts/src/com/lightcrafts/jai/utils/LCTileScheduler.java
@@ -191,7 +191,7 @@ final class RequestJob implements Job {
     final int offset;            // offset into arrays
 
     boolean done = false;        // flag indicating completion status
-    Exception exception = null;  // Any exception that might have occured
+    Exception exception = null;  // Any exception that might have occurred
                                  // during computeTile
 
     /** Constructor. */
@@ -336,7 +336,7 @@ final class TileJob implements Job {
 
     boolean done = false;       // flag indicating completion status
     Exception exception = null; // The first exception that might have
-                                // occured during computeTile
+                                // occurred during computeTile
 
     /** Constructor. */
     TileJob(LCTileScheduler scheduler, boolean isBlocking,
@@ -870,7 +870,7 @@ public Raster scheduleTile(OpImage owner,
      * @return The computed tiles.  This value is meaningless if
      *         <code>listener</code> is non-<code>null</code>.
      */
-    // The allowable arguments are constained as follows:
+    // The allowable arguments are constrained as follows:
     // A) owner and tileIndices non-null.
     // B) (isBlocking,isPrefetch) in {(true,false),(false,false),(false,true)}
     // C) listeners != null <=> (isBlocking,isPrefetch) == (false,false)
@@ -971,10 +971,10 @@ private Object scheduleJob(PlanarImage owner,
 
                     // Allocate the maximum possible number of multi-tile jobs.
                     // This will be larger than the actual number of jobs but
-                    // a more precise calcuation is not possible and a dynamic
+                    // a more precise calculation is not possible and a dynamic
                     // storage object such as a Collection would not be useful
                     // since as calculated maxNumJobs = 4*numThreads if the
-                    // preceeding values of "frac" and "minTilesPerThread" are
+                    // preceding values of "frac" and "minTilesPerThread" are
                     // 1/(2*numThreads) and frac*numTiles/2, respectively.
                     int maxNumJobs = numThreads == 1 ? 1 :
                         (int)((float)numTiles/(float)minTilesPerThread+0.5F);
@@ -1237,7 +1237,7 @@ public void prefetchTiles(PlanarImage owner,
      * indicates that all tile computation will be effected in the primary
      * thread.  A parallelism value of <i>N</i> indicates that there will be
      * <i>N</i> worker threads in addition to the primary scheduler thread.
-     * In JAI the parallelism defaults to a value of 2 unless explicity set
+     * In JAI the parallelism defaults to a value of 2 unless explicitly set
      * by the application.
      *
      * @param parallelism The suggested degree of parallelism.
diff --git a/lightcrafts/src/com/lightcrafts/model/CloneContour.java b/lightcrafts/src/com/lightcrafts/model/CloneContour.java
index a966696ed..365b7d429 100644
--- a/lightcrafts/src/com/lightcrafts/model/CloneContour.java
+++ b/lightcrafts/src/com/lightcrafts/model/CloneContour.java
@@ -6,7 +6,7 @@
 
 /**
  * A Contour with one extra piece of information: a Point2D, a location on
- * the image in image coordiantes, that defines a translation interval for
+ * the image in image coordinates, that defines a translation interval for
  * cloning.
  * <p>
  * @see com.lightcrafts.model.CloneOperation
diff --git a/lightcrafts/src/com/lightcrafts/model/Preview.java b/lightcrafts/src/com/lightcrafts/model/Preview.java
index c82e7d040..75b014338 100644
--- a/lightcrafts/src/com/lightcrafts/model/Preview.java
+++ b/lightcrafts/src/com/lightcrafts/model/Preview.java
@@ -50,7 +50,7 @@ public void addImpl(Component comp, Object constraints, int index) {
 
     /**
      * Sets the selection state of a preview
-     * @param selected wether the preview component is selected or not
+     * @param selected whether the preview component is selected or not
      */
     public abstract void setSelected(Boolean selected);
 
diff --git a/lightcrafts/src/com/lightcrafts/model/SliderConfig.java b/lightcrafts/src/com/lightcrafts/model/SliderConfig.java
index 87c628d0f..557e7982d 100644
--- a/lightcrafts/src/com/lightcrafts/model/SliderConfig.java
+++ b/lightcrafts/src/com/lightcrafts/model/SliderConfig.java
@@ -21,7 +21,7 @@
   * </ul>
   * <p>
   * These options have various consistency conditions.  If a consistency
-  * condtion is violated, the SliderConfig constructor will throw
+  * condition is violated, the SliderConfig constructor will throw
   * IllegalArgumentException.
   * <p>
   * @see com.lightcrafts.model.GenericOperation
diff --git a/lightcrafts/src/com/lightcrafts/platform/DefaultAlertDialog.java b/lightcrafts/src/com/lightcrafts/platform/DefaultAlertDialog.java
index 9f8c0d482..17f2a9dbd 100644
--- a/lightcrafts/src/com/lightcrafts/platform/DefaultAlertDialog.java
+++ b/lightcrafts/src/com/lightcrafts/platform/DefaultAlertDialog.java
@@ -112,7 +112,7 @@ private DefaultAlertDialog() {
     }
 
     /**
-     * The backgorund color of the dialog contents shown by
+     * The background color of the dialog contents shown by
      * JOptionPane.showOptionDialog(), which we would like to match in
      * our JTextAreas.
      */
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/model/ImageList.java b/lightcrafts/src/com/lightcrafts/ui/browser/model/ImageList.java
index def72a423..e7a509433 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/model/ImageList.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/model/ImageList.java
@@ -250,7 +250,7 @@ public void setImageGroupProvider(ImageGroupProvider groups) {
     }
 
     /**
-     * Specify a new thumbnal size.  This immediately queues a background task
+     * Specify a new thumbnail size.  This immediately queues a background task
      * for each image.
      */
     public void setSize(int size) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/view/BrowserScrollPaneUI.java b/lightcrafts/src/com/lightcrafts/ui/browser/view/BrowserScrollPaneUI.java
index 13c37baed..2fb3775d7 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/view/BrowserScrollPaneUI.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/view/BrowserScrollPaneUI.java
@@ -14,7 +14,7 @@
  * physical wheel click to translate into one scroll unit increment, which
  * the browser interprets as one row of browser thumbnails.
  * <p>
- * On Mac, BasicScrollPaneUI sems to posess this virtue for free.
+ * On Mac, BasicScrollPaneUI sems to possess this virtue for free.
  */
 
 class BrowserScrollPaneUI extends BasicScrollPaneUI {
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumRatingRenderer.java b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumRatingRenderer.java
index 09f868006..8427f4fe3 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumRatingRenderer.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumRatingRenderer.java
@@ -103,7 +103,7 @@ static void paint(Graphics2D g, Rectangle2D rect, int rating) {
     }
     
     // Get coordinates where the text origin should go.
-    // This is the start of the basline, suitable for g.drawString().
+    // This is the start of the baseline, suitable for g.drawString().
     private static Point2D getTextOrigin(
         Rectangle2D rect, Graphics2D g, String text
     ) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumTypeRenderer.java b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumTypeRenderer.java
index 33a8feafd..69415a1a5 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumTypeRenderer.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumTypeRenderer.java
@@ -73,7 +73,7 @@ static void paint(Graphics2D g, Rectangle2D rect, String text) {
     }
     
     // Get coordinates where the text origin should go.
-    // This is the start of the basline, suitable for g.drawString().
+    // This is the start of the baseline, suitable for g.drawString().
     private static Point2D getTextOrigin(
         Rectangle2D rect, Graphics2D g, String text
     ) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumUrgencyRenderer.java b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumUrgencyRenderer.java
index c4391c2ab..630e071f2 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumUrgencyRenderer.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageDatumUrgencyRenderer.java
@@ -39,7 +39,7 @@ static void paint(Graphics2D g, Rectangle2D rect, int urgency) {
     }
 
     // Get coordinates where the text origin should go.
-    // This is the start of the basline, suitable for g.drawString().
+    // This is the start of the baseline, suitable for g.drawString().
     private static Point2D getTextOrigin(
             Rectangle2D rect, Graphics2D g, String text
     ) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageGroupCountRenderer.java b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageGroupCountRenderer.java
index 2b54bcbda..cf74342de 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageGroupCountRenderer.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImageGroupCountRenderer.java
@@ -86,7 +86,7 @@ static void paint(Graphics2D g, Rectangle2D rect, String text) {
     }
     
     // Get coordinates where the text origin should go.
-    // This is the start of the basline, suitable for g.drawString().
+    // This is the start of the baseline, suitable for g.drawString().
     private static Point2D getTextOrigin(
         Rectangle2D rect, Graphics2D g, String text
     ) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImagePreservationQueue.java b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImagePreservationQueue.java
index 661ad8cfa..35c51a0bb 100644
--- a/lightcrafts/src/com/lightcrafts/ui/browser/view/ImagePreservationQueue.java
+++ b/lightcrafts/src/com/lightcrafts/ui/browser/view/ImagePreservationQueue.java
@@ -17,7 +17,7 @@
  */
 class ImagePreservationQueue extends LinkedHashSet<RenderedImage> {
 
-    // The number of recently used images to withold from GC:
+    // The number of recently used images to withhold from GC:
     final static int Limit = 100;
 
     public boolean add(RenderedImage image) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/crop/CropOverlay.java b/lightcrafts/src/com/lightcrafts/ui/crop/CropOverlay.java
index 13793d056..4f2fd1fc0 100644
--- a/lightcrafts/src/com/lightcrafts/ui/crop/CropOverlay.java
+++ b/lightcrafts/src/com/lightcrafts/ui/crop/CropOverlay.java
@@ -1228,7 +1228,7 @@ private Point2D getClosestUnderlayPoint(Point2D p) {
         return p;
     }
 
-//    // Repaint this overlay when the CropBounds udpates, marking dirty as
+//    // Repaint this overlay when the CropBounds updates, marking dirty as
 //    // little of the component as possible to minimize thrash painting of
 //    // the underlay.
 //    private void repaint(CropBounds oldCrop, CropBounds newCrop) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipComponent.java b/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipComponent.java
index 30b2f7947..b033fc380 100644
--- a/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipComponent.java
+++ b/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipComponent.java
@@ -57,13 +57,13 @@ class DataTipComponent extends JToolTip {
     }
 
     /**
-     * Overriden, so that Swing does not create a ToolTipUI.
+     * Overridden, so that Swing does not create a ToolTipUI.
      */
     public void updateUI() {
     }
 
     /**
-     * Overriden to always return false, so that no component ever receives mouse events.
+     * Overridden to always return false, so that no component ever receives mouse events.
      * Instead a mouse press will be caught on the popup's window ancestor, the popup will be hidden and the mouse press redispatched
      * to the underlying component.
      */
diff --git a/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipListener.java b/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipListener.java
index ed65c8098..311ea8a77 100644
--- a/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipListener.java
+++ b/lightcrafts/src/com/lightcrafts/ui/datatips/xswing/DataTipListener.java
@@ -80,8 +80,8 @@ abstract class DataTipListener extends MouseInputAdapter implements ComponentLis
     /**
      * If the user presses a mouse button on a popup, Swing's behaviour depends on the popup type:
      * - lightweight popup:
-     *   This case is handled here. Because the TipComponent.contains(int x, int y) is overriden to always return false
-     *   Swing will dispath the event directly to the parent component.
+     *   This case is handled here. Because the TipComponent.contains(int x, int y) is overridden to always return false
+     *   Swing will dispatch the event directly to the parent component.
      * - heavyweight popup:
      *   Swing will dispatch the event to the popup's window, which is handled in DataTipPopup.
      */
diff --git a/lightcrafts/src/com/lightcrafts/ui/editor/Editor.java b/lightcrafts/src/com/lightcrafts/ui/editor/Editor.java
index 42603cdd1..fc3aa48c6 100644
--- a/lightcrafts/src/com/lightcrafts/ui/editor/Editor.java
+++ b/lightcrafts/src/com/lightcrafts/ui/editor/Editor.java
@@ -603,7 +603,7 @@ void dispose() {
             regionMode.dispose();
     }
 
-    // Tell this Editor that save is occuring, and so it should commit any
+    // Tell this Editor that save is occurring, and so it should commit any
     // crop or rotate state from its modes.
     public TemporaryEditorCommitState saveStart() {
         boolean isCropActive = (overlay.peekMode() == cropMode);
diff --git a/lightcrafts/src/com/lightcrafts/ui/export/ExportLogic.java b/lightcrafts/src/com/lightcrafts/ui/export/ExportLogic.java
index c9fb6b475..c140e3c4b 100644
--- a/lightcrafts/src/com/lightcrafts/ui/export/ExportLogic.java
+++ b/lightcrafts/src/com/lightcrafts/ui/export/ExportLogic.java
@@ -23,7 +23,7 @@
  * <ul>
  *   <li>The original image (color space, image type)</li>
  *   <li>Edits made by the user (crop bounds)</li>
- *   <li>User prefences (workflow settings, default directory)</li>
+ *   <li>User preferences (workflow settings, default directory)</li>
  *   <li>Export settings previously used for the current image</li>
  *   <li>The most recent export settings used</li>
  *   <li>The most recent export settings used to export each image type (in
diff --git a/lightcrafts/src/com/lightcrafts/ui/export/ExportSizeFields.java b/lightcrafts/src/com/lightcrafts/ui/export/ExportSizeFields.java
index dc5384b05..fbe2b14e5 100644
--- a/lightcrafts/src/com/lightcrafts/ui/export/ExportSizeFields.java
+++ b/lightcrafts/src/com/lightcrafts/ui/export/ExportSizeFields.java
@@ -169,7 +169,7 @@ public boolean verify(JComponent input) {
         }
     };
 
-    // Repsond to valid text changes with color changes and updates to the
+    // Respond to valid text changes with color changes and updates to the
     // ImageExportOptions object:
 
     private final class ExportUpdater implements DocumentListener {
diff --git a/lightcrafts/src/com/lightcrafts/ui/export/SaveOptions.java b/lightcrafts/src/com/lightcrafts/ui/export/SaveOptions.java
index 3274e1dc2..d6333bb0c 100644
--- a/lightcrafts/src/com/lightcrafts/ui/export/SaveOptions.java
+++ b/lightcrafts/src/com/lightcrafts/ui/export/SaveOptions.java
@@ -41,7 +41,7 @@ void verifyMarker(XmlNode node) throws XMLException {
     }
 
     /**
-     * If the save format is LZN, then the auxilliary options are just the File
+     * If the save format is LZN, then the auxiliary options are just the File
      * to use.
      */
     public static class Lzn extends Options {
@@ -84,7 +84,7 @@ static Lzn restore(XmlNode node) throws XMLException {
     }
 
     /**
-     * If the save format is Sidecar TIFF, then the auxilliary options are a
+     * If the save format is Sidecar TIFF, then the auxiliary options are a
      * TIFFImageType.ExportOptions.
      */
     public static class SidecarTiff extends Options {
@@ -129,7 +129,7 @@ static SidecarTiff restore(XmlNode node) throws XMLException {
     }
 
     /**
-     * If the save format is Sidecar JPEG, then the auxilliary options are a
+     * If the save format is Sidecar JPEG, then the auxiliary options are a
      * JPEGImageType.ExportOptions (guaranteed to have its multilayer flag
      * unset).
      */
@@ -175,7 +175,7 @@ static SidecarJpeg restore(XmlNode node) throws XMLException {
     }
 
     /**
-     * If the save format is Multilayer TIFF, then the auxilliary option is
+     * If the save format is Multilayer TIFF, then the auxiliary option is
      * a TIFFImageType.ExportOptions that is guaranteed to have its
      * multilayer flag set.
      */
diff --git a/lightcrafts/src/com/lightcrafts/ui/help/HelpConstants.java b/lightcrafts/src/com/lightcrafts/ui/help/HelpConstants.java
index dc753bf19..fec629a8d 100644
--- a/lightcrafts/src/com/lightcrafts/ui/help/HelpConstants.java
+++ b/lightcrafts/src/com/lightcrafts/ui/help/HelpConstants.java
@@ -5,7 +5,7 @@
 import com.lightcrafts.platform.Platform;
 
 /**
- * These contants can be passed to {@link Platform#showHelpTopic(String)}.
+ * These constants can be passed to {@link Platform#showHelpTopic(String)}.
  *
  * @author Paul J. Lucas [paul@lightcrafts.com]
  */
diff --git a/lightcrafts/src/com/lightcrafts/ui/layout/FadingTabbedPanelListener.java b/lightcrafts/src/com/lightcrafts/ui/layout/FadingTabbedPanelListener.java
index 0f2ce9000..e956be2a4 100644
--- a/lightcrafts/src/com/lightcrafts/ui/layout/FadingTabbedPanelListener.java
+++ b/lightcrafts/src/com/lightcrafts/ui/layout/FadingTabbedPanelListener.java
@@ -3,7 +3,7 @@
 package com.lightcrafts.ui.layout;
 
 /**
- * Find out when a FadingTabbedPanel transitions from someting selected to
+ * Find out when a FadingTabbedPanel transitions from something selected to
  * nothing selected; and from nothing to something.
  */
 public interface FadingTabbedPanelListener {
diff --git a/lightcrafts/src/com/lightcrafts/ui/mode/ModeOverlay.java b/lightcrafts/src/com/lightcrafts/ui/mode/ModeOverlay.java
index a638cb3bb..73155a8b1 100644
--- a/lightcrafts/src/com/lightcrafts/ui/mode/ModeOverlay.java
+++ b/lightcrafts/src/com/lightcrafts/ui/mode/ModeOverlay.java
@@ -150,7 +150,7 @@ private void removeMode(Mode mode) {
     }
 
     /**
-     * Prefered size is just the preferred size of the underlay, unless we're
+     * Preferred size is just the preferred size of the underlay, unless we're
      * in a scroll pane, in which case it's the maximum of that size and the
      * size of the viewport.
      */
diff --git a/lightcrafts/src/com/lightcrafts/ui/operation/generic/ConfiguredTextField.java b/lightcrafts/src/com/lightcrafts/ui/operation/generic/ConfiguredTextField.java
index 7f2c1f210..678a5fb46 100644
--- a/lightcrafts/src/com/lightcrafts/ui/operation/generic/ConfiguredTextField.java
+++ b/lightcrafts/src/com/lightcrafts/ui/operation/generic/ConfiguredTextField.java
@@ -60,7 +60,7 @@ public void focusLost(FocusEvent event) {
         setInputVerifier(new IntervalVerifier(min, max));
         setHorizontalAlignment(RIGHT);
 
-        setFont(getFont()); // Figure out the maxiumum text width
+        setFont(getFont()); // Figure out the maximum text width
 
         addListeners();
 
diff --git a/lightcrafts/src/com/lightcrafts/ui/operation/zone/ComponentScaler.java b/lightcrafts/src/com/lightcrafts/ui/operation/zone/ComponentScaler.java
index 27b5dd186..356ae4654 100644
--- a/lightcrafts/src/com/lightcrafts/ui/operation/zone/ComponentScaler.java
+++ b/lightcrafts/src/com/lightcrafts/ui/operation/zone/ComponentScaler.java
@@ -15,7 +15,7 @@
  */
 class ComponentScaler {
 
-    /** Get the scale value correpsonding to the vertical midpoint of the
+    /** Get the scale value corresponding to the vertical midpoint of the
      * Component relative to its parent's height.
      */
     static double componentToScale(Component comp) {
diff --git a/lightcrafts/src/com/lightcrafts/ui/print/PositionPanel.java b/lightcrafts/src/com/lightcrafts/ui/print/PositionPanel.java
index 8aa0b2fd0..c1cdd24ce 100644
--- a/lightcrafts/src/com/lightcrafts/ui/print/PositionPanel.java
+++ b/lightcrafts/src/com/lightcrafts/ui/print/PositionPanel.java
@@ -94,7 +94,7 @@ public void dimensionChanged(double top) {
         titlePanel.add(box);
     }
 
-    // Update a dimension text field when its corresonding units change:
+    // Update a dimension text field when its corresponding units change:
 
     private static void syncTextWithUnit(
         final DimensionTextField text, final UnitComboBox unit
diff --git a/lightcrafts/src/com/lightcrafts/ui/print/SizePanel.java b/lightcrafts/src/com/lightcrafts/ui/print/SizePanel.java
index b0ae62c63..9925b3949 100644
--- a/lightcrafts/src/com/lightcrafts/ui/print/SizePanel.java
+++ b/lightcrafts/src/com/lightcrafts/ui/print/SizePanel.java
@@ -156,7 +156,7 @@ public void dimensionChanged(double width) {
         titlePanel.add(box);
     }
 
-    // Update a dimension text field when its corresonding units change:
+    // Update a dimension text field when its corresponding units change:
 
     private static void syncTextWithUnit(
         final DimensionTextField text, final UnitComboBox unit
diff --git a/lightcrafts/src/com/lightcrafts/ui/region/RegionModel.java b/lightcrafts/src/com/lightcrafts/ui/region/RegionModel.java
index 11546d6bf..4c22190d2 100644
--- a/lightcrafts/src/com/lightcrafts/ui/region/RegionModel.java
+++ b/lightcrafts/src/com/lightcrafts/ui/region/RegionModel.java
@@ -37,7 +37,7 @@
  * also a single "editing" Curve, which is drawn with its control points
  * visible and with an extra layer of edit batching for listeners.
  * <p>
- * Every Curve may have an associated ClonePoint, to accomodate the Curves
+ * Every Curve may have an associated ClonePoint, to accommodate the Curves
  * used by the clone tool.
  * <p>
  * There is also one RegionMode per RegionModel, which determines the policies
diff --git a/lightcrafts/src/com/lightcrafts/ui/region/RegionOverlay.java b/lightcrafts/src/com/lightcrafts/ui/region/RegionOverlay.java
index e9efdabdb..2fecc9b57 100644
--- a/lightcrafts/src/com/lightcrafts/ui/region/RegionOverlay.java
+++ b/lightcrafts/src/com/lightcrafts/ui/region/RegionOverlay.java
@@ -227,7 +227,7 @@ public void save(List cookies, XmlNode node) {
     }
 
     /**
-     * This method restores CubicCurves and reforms their assocations with
+     * This method restores CubicCurves and reforms their associations with
      * cookie Objects as identified by their order in the argument.  The
      * cookies must already be restored and added to the overlay before this
      * is called.
diff --git a/lightcrafts/src/com/lightcrafts/ui/region/curves/CubicBezierCurve.java b/lightcrafts/src/com/lightcrafts/ui/region/curves/CubicBezierCurve.java
index 9d65e2c77..6352c3ea7 100644
--- a/lightcrafts/src/com/lightcrafts/ui/region/curves/CubicBezierCurve.java
+++ b/lightcrafts/src/com/lightcrafts/ui/region/curves/CubicBezierCurve.java
@@ -80,7 +80,7 @@ private Cubic[] calcNaturalCubic(int[] x) {
         [1      1 4] [D[n]]   [3(x[0] - x[n-1])]
 
         by decomposing the matrix into upper triangular and lower matrices
-        and then back sustitution.  See Spath "Spline Algorithms for Curves
+        and then back substitution.  See Spath "Spline Algorithms for Curves
         and Surfaces" pp 19--21. The D[i] are the derivatives at the knots.
         */
 
diff --git a/lightcrafts/src/com/lightcrafts/ui/scroll/CenteringViewportLayout.java b/lightcrafts/src/com/lightcrafts/ui/scroll/CenteringViewportLayout.java
index 9c6ca2cca..44ebe83eb 100644
--- a/lightcrafts/src/com/lightcrafts/ui/scroll/CenteringViewportLayout.java
+++ b/lightcrafts/src/com/lightcrafts/ui/scroll/CenteringViewportLayout.java
@@ -8,7 +8,7 @@
 /** Just like ViewportLayout, except that in layoutContainer(), before
   * setViewSize() gets called (triggering state change events that lead to
   * all kinds of havoc with the visible view bounds), changes in view size
-  * are detected and view bounds are first udpated to preserve the center of
+  * are detected and view bounds are first updated to preserve the center of
   * the visible region.
   */
 
diff --git a/lightcrafts/src/com/lightcrafts/ui/swing/RangeSelectorModel.java b/lightcrafts/src/com/lightcrafts/ui/swing/RangeSelectorModel.java
index 44de75328..710350aa1 100644
--- a/lightcrafts/src/com/lightcrafts/ui/swing/RangeSelectorModel.java
+++ b/lightcrafts/src/com/lightcrafts/ui/swing/RangeSelectorModel.java
@@ -26,7 +26,7 @@ public RangeSelectorModel() {
      * @param lowerThumbFeatheringValue The lower thumb feathering value.
      * @param upperThumbValue The upper thumb value.
      * @param upperThumbFeatheringValue The upper thumb feathering value.
-     * @param minimumTrackValue The minumum track value.
+     * @param minimumTrackValue The minimum track value.
      * @param maximumTrackValue The maximum track value.
      * @param trackValue The track value.
      */
@@ -292,7 +292,7 @@ public boolean setThumbProperties( int minimumThumbValue,
      * min &lt;= LTV &lt;= TV &lt;= UTV &lt;= max
      * </blockquote>
      *
-     * @param minimumTrackValue The minumum track value.
+     * @param minimumTrackValue The minimum track value.
      * @param maximumTrackValue The maximum track value.
      * @param trackValue The track value.
      * @return Returns <code>true</code> only if any of the new values is
diff --git a/lightcrafts/src/com/lightcrafts/ui/templates/TemplateRootNode.java b/lightcrafts/src/com/lightcrafts/ui/templates/TemplateRootNode.java
index b698c4ccb..571544b02 100644
--- a/lightcrafts/src/com/lightcrafts/ui/templates/TemplateRootNode.java
+++ b/lightcrafts/src/com/lightcrafts/ui/templates/TemplateRootNode.java
@@ -9,7 +9,7 @@
 import java.util.*;
 
 /**
- * An invisibile, universal root node to hold template namepsace nodes.
+ * An invisible, universal root node to hold template namespace nodes.
  */
 class TemplateRootNode implements TreeNode {
 
diff --git a/lightcrafts/src/com/lightcrafts/ui/toolkit/CoolButtonBackground.java b/lightcrafts/src/com/lightcrafts/ui/toolkit/CoolButtonBackground.java
index 471a632c6..e357e7b5e 100644
--- a/lightcrafts/src/com/lightcrafts/ui/toolkit/CoolButtonBackground.java
+++ b/lightcrafts/src/com/lightcrafts/ui/toolkit/CoolButtonBackground.java
@@ -12,7 +12,7 @@
  * <p>
  * These backgrounds extend beyond the button's icon, and so they
  * require extra insets in the button layout.  CoolButton takes the Insets
- * declared here and uses them to inialize an empty border on itself.
+ * declared here and uses them to initialize an empty border on itself.
  * CoolButtonBackground then paints over the empty border set up by
  * CoolButton when asked to do so by a call to paint().
  * <p>
diff --git a/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFactory.java b/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFactory.java
index 0f27d09fc..d86c4b54d 100644
--- a/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFactory.java
+++ b/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFactory.java
@@ -25,7 +25,7 @@ public class IconFactory {
 
     /**
      * The resource assumption is that icons are accessible through the
-     * IconFactory's classloader, namespaced by the class of a corresonding
+     * IconFactory's classloader, namespaced by the class of a corresponding
      * object (like a button that uses the icon) with an extra "resources"
      * name at the end.
      */
diff --git a/lightcrafts/src/com/lightcrafts/ui/toolkit/ShadowFactory.java b/lightcrafts/src/com/lightcrafts/ui/toolkit/ShadowFactory.java
index bb7e0ab50..ad4689971 100644
--- a/lightcrafts/src/com/lightcrafts/ui/toolkit/ShadowFactory.java
+++ b/lightcrafts/src/com/lightcrafts/ui/toolkit/ShadowFactory.java
@@ -40,7 +40,7 @@
  *   <li><i>color</i>: The color of the shadow. Shadows are not meant to be
  *   black only.</li>
  * </ul>
- * You can set these properties using the provided mutaters or the appropriate
+ * You can set these properties using the provided mutators or the appropriate
  * constructor. Here are two ways of creating a green shadow of size 10 and
  * with an opacity of 50%:
  * <pre>
@@ -66,7 +66,7 @@
  * factory.setRenderingHint(ShadowFactory.KEY_BLUR_QUALITY,
  *                          ShadowFactory.VALUE_BLUR_QUALITY_HIGH);
  * </pre>
- * The default rendering algorihtm is <code>VALUE_BLUR_QUALITY_FAST</code>.</p>
+ * The default rendering algorithm is <code>VALUE_BLUR_QUALITY_FAST</code>.</p>
  * <p>The current implementation should provide the same quality with both
  * algorithms but performances are guaranteed to be better (about 30 times
  * faster) with the <i>fast quality blur</i>.</p>
diff --git a/lightcrafts/src/com/lightcrafts/utils/LCMS.java b/lightcrafts/src/com/lightcrafts/utils/LCMS.java
index 5d0ea323a..2a1996691 100644
--- a/lightcrafts/src/com/lightcrafts/utils/LCMS.java
+++ b/lightcrafts/src/com/lightcrafts/utils/LCMS.java
@@ -31,7 +31,7 @@ public class LCMS {
 //            T: Pixeltype
 //            F: Flavor  0=MinIsBlack(Chocolate) 1=MinIsWhite(Vanilla)
 //            P: Planar? 0=Chunky, 1=Planar
-//            X: swap 16 bps endianess?
+//            X: swap 16 bps endianness?
 //            S: Do swap? ie, BGR, KYMC
 //            E: Extra samples
 //            C: Channels (Samples per pixel)
@@ -275,8 +275,8 @@ public class LCMS {
 
     public static final int cmsFLAGS_NOTPRECALC              = 0x0100;
     public static final int cmsFLAGS_NULLTRANSFORM           = 0x0200;    // Don't transform anyway
-    public static final int cmsFLAGS_HIGHRESPRECALC          = 0x0400;    // Use more memory to give better accurancy
-    public static final int cmsFLAGS_LOWRESPRECALC           = 0x0800;    // Use less memory to minimize resouces
+    public static final int cmsFLAGS_HIGHRESPRECALC          = 0x0400;    // Use more memory to give better accuracy
+    public static final int cmsFLAGS_LOWRESPRECALC           = 0x0800;    // Use less memory to minimize resources
 
 
     public static final int cmsFLAGS_WHITEBLACKCOMPENSATION  = 0x2000;
diff --git a/lightcrafts/src/com/lightcrafts/utils/Rational.java b/lightcrafts/src/com/lightcrafts/utils/Rational.java
index da31b7068..d5cd47620 100644
--- a/lightcrafts/src/com/lightcrafts/utils/Rational.java
+++ b/lightcrafts/src/com/lightcrafts/utils/Rational.java
@@ -147,7 +147,7 @@ public int numerator() {
      * in the string must either be:
      *  <ul>
      *    <li>
-     *      Two sets of decimal digits seperated by a single ASCII slash
+     *      Two sets of decimal digits separated by a single ASCII slash
      *      <code>'/'</code> (<code>'\u002F'</code>) character
      *      in which case the first set is parsed as the numerator
      *      and the second set is parsed as the denominator.
diff --git a/lightcrafts/src/com/lightcrafts/utils/TextUtil.java b/lightcrafts/src/com/lightcrafts/utils/TextUtil.java
index ac09368a5..93812bcb6 100644
--- a/lightcrafts/src/com/lightcrafts/utils/TextUtil.java
+++ b/lightcrafts/src/com/lightcrafts/utils/TextUtil.java
@@ -59,10 +59,10 @@ public static String hexString( byte[] buf ) {
     }
 
     /**
-     * Join an array of strings together seperated by a separator string.
+     * Join an array of strings together separated by a separator string.
      *
      * @param strings The strings to join.
-     * @param sep The seperator or <code>null</code>.
+     * @param sep The separator or <code>null</code>.
      * @return Returns the joined strings.
      */
     public static String join( String[] strings, String sep ) {
diff --git a/lightcrafts/src/com/lightcrafts/utils/bytebuffer/LCByteBuffer.java b/lightcrafts/src/com/lightcrafts/utils/bytebuffer/LCByteBuffer.java
index 380b02c3c..4f91ebc94 100644
--- a/lightcrafts/src/com/lightcrafts/utils/bytebuffer/LCByteBuffer.java
+++ b/lightcrafts/src/com/lightcrafts/utils/bytebuffer/LCByteBuffer.java
@@ -15,7 +15,7 @@
  * implement.  This is totally brain-damaged.
  * <p>
  * Despite not being derived from <code>ByteBuffer</code>, the API is designed
- * to mimick <code>ByteBuffer</code>'s API.
+ * to mimic <code>ByteBuffer</code>'s API.
  * <p>
  * Most of the methods are declared to throw {@link IOException} because some
  * implementations may choose to use file I/O as the backing-store for the
@@ -241,7 +241,7 @@ public final boolean getEquals( String s, String charsetName )
 
     /**
      * Gets a {@link String} that is the same length as the given string
-     * starting at the given position and comares the two strings for equality.
+     * starting at the given position and compares the two strings for equality.
      * The buffer's current position is not changed.
      *
      * @param pos The position to get the {@link String} from.
diff --git a/lightcrafts/src/com/lightcrafts/utils/file/FileIterator.java b/lightcrafts/src/com/lightcrafts/utils/file/FileIterator.java
index cd5015707..608157ec4 100644
--- a/lightcrafts/src/com/lightcrafts/utils/file/FileIterator.java
+++ b/lightcrafts/src/com/lightcrafts/utils/file/FileIterator.java
@@ -114,7 +114,7 @@ private void addIfOK( File file ) {
     private final FileFilter m_filter;
 
     /**
-     * The cahced next {@link File} to return.
+     * The cached next {@link File} to return.
      */
     private File m_next;
 
diff --git a/lightcrafts/src/com/lightcrafts/utils/file/FileUtil.java b/lightcrafts/src/com/lightcrafts/utils/file/FileUtil.java
index a77dd20e2..9d271a14c 100644
--- a/lightcrafts/src/com/lightcrafts/utils/file/FileUtil.java
+++ b/lightcrafts/src/com/lightcrafts/utils/file/FileUtil.java
@@ -63,7 +63,7 @@ public static void copyFile( File source, File target ) throws IOException {
      *
      * @param files The {@link File}s to delete.
      * @param filter The {@link FileFilter} to use; may be <code>null</code>.
-     * @param recursive If <code>true</code>, also delete all enountered
+     * @param recursive If <code>true</code>, also delete all encountered
      * subdirectories and their contents.
      * @return Returns <code>true</code> only if all the files were deleted
      * successfully and there were no I/O errors.
diff --git a/lightcrafts/src/com/lightcrafts/utils/raw/DCRaw.java b/lightcrafts/src/com/lightcrafts/utils/raw/DCRaw.java
index 6490fe5e9..af640e494 100644
--- a/lightcrafts/src/com/lightcrafts/utils/raw/DCRaw.java
+++ b/lightcrafts/src/com/lightcrafts/utils/raw/DCRaw.java
@@ -474,7 +474,7 @@ public synchronized RenderedImage runDCRaw(dcrawMode mode, boolean secondaryPixe
             throws IOException, UnknownImageTypeException, BadImageFileException
     {
         if (!m_decodable || (mode == dcrawMode.full && m_rawColors != 3)) {
-            throw new UnknownImageTypeException("Unsuported Camera");
+            throw new UnknownImageTypeException("Unsupported Camera");
         }
 
         RenderedImage result = null;
diff --git a/lightcrafts/src/com/lightcrafts/utils/thread/ProgressThread.java b/lightcrafts/src/com/lightcrafts/utils/thread/ProgressThread.java
index cd31cdc53..6f448cc57 100644
--- a/lightcrafts/src/com/lightcrafts/utils/thread/ProgressThread.java
+++ b/lightcrafts/src/com/lightcrafts/utils/thread/ProgressThread.java
@@ -17,7 +17,7 @@ public abstract class ProgressThread extends CancelableThread {
     /**
      * Gets this <code>ProgressThread</code>'s {@link ProgressIndicator}.
      *
-     * @return Retuns said {@link ProgressIndicator}.
+     * @return Returns said {@link ProgressIndicator}.
      */
     public final ProgressIndicator getProgressIndicator() {
         return m_progressIndicator;
diff --git a/lightcrafts/test/src/tilecachetool/TCInfo.java b/lightcrafts/test/src/tilecachetool/TCInfo.java
index 9f84374e0..194a95aa0 100644
--- a/lightcrafts/test/src/tilecachetool/TCInfo.java
+++ b/lightcrafts/test/src/tilecachetool/TCInfo.java
@@ -168,7 +168,7 @@ public void setMemoryCapacitySliderMaximum(int max_mem) {
      }
 
     /**
-     * Responce to slider changes
+     * Response to slider changes
      */
     public void stateChanged(ChangeEvent e) {
         JSlider slider = (JSlider) e.getSource();
diff --git a/lightcrafts/tools/bin/lc-locale-unflatten.sh b/lightcrafts/tools/bin/lc-locale-unflatten.sh
index b71aad758..52e4de883 100755
--- a/lightcrafts/tools/bin/lc-locale-unflatten.sh
+++ b/lightcrafts/tools/bin/lc-locale-unflatten.sh
@@ -9,7 +9,7 @@
 #
 # where (flat-properties) is a flattened properties collection generated by
 # lc-locale-flatten.sh and (locale) is the two-letter language abbreviation
-# for the ouptut properties file names.
+# for the output properties file names.
 #
 # Be sure to check that the encoding of (flat-properties) is ISO 8859-1
 # ("Latin 1").  If it is not, then convert it first using native2ascii.
diff --git a/macosx/src/com/lightcrafts/app/other/MacApplication.java b/macosx/src/com/lightcrafts/app/other/MacApplication.java
index 256a0a6b2..cad8c7bbc 100644
--- a/macosx/src/com/lightcrafts/app/other/MacApplication.java
+++ b/macosx/src/com/lightcrafts/app/other/MacApplication.java
@@ -20,7 +20,7 @@ public abstract class MacApplication extends OtherApplication {
      *
      * @param bundleSig The bundle signature for the application.
      * @return Returns said {@link OtherApplication} or
-     * {@link UnknownApplication#INSTANCE} if the other application is unkown.
+     * {@link UnknownApplication#INSTANCE} if the other application is unknown.
      */
     public static OtherApplication getAppForSignature( String bundleSig ) {
         final OtherApplication app = m_bundleSigToApp.get( bundleSig );
diff --git a/macosx/src/com/lightcrafts/platform/macosx/AppleScript.java b/macosx/src/com/lightcrafts/platform/macosx/AppleScript.java
index 33e6430ac..6cd34bfea 100644
--- a/macosx/src/com/lightcrafts/platform/macosx/AppleScript.java
+++ b/macosx/src/com/lightcrafts/platform/macosx/AppleScript.java
@@ -24,7 +24,7 @@ public static void bringAppToFront( String appName ) {
      * Runs an AppleScript.
      *
      * @param script The AppleScript to run.  Note: for multi-line scripts,
-     * don't forget to seperate lines with newlines!
+     * don't forget to separate lines with newlines!
      * @throws IllegalArgumentException if the script contains errors.
      */
     public static native void run( String script );
diff --git a/macosx/src/com/lightcrafts/platform/macosx/MacOSXSmartFolder.java b/macosx/src/com/lightcrafts/platform/macosx/MacOSXSmartFolder.java
index dc32662e3..bd8ecb545 100644
--- a/macosx/src/com/lightcrafts/platform/macosx/MacOSXSmartFolder.java
+++ b/macosx/src/com/lightcrafts/platform/macosx/MacOSXSmartFolder.java
@@ -111,7 +111,7 @@ public static boolean isSmartFolder( String path ) {
      * Gets an array of strings naming the files and directories in the
      * directory denoted by this abstract pathname.  When the pathname refers
      * to a "Smart Folder", its query is performed and the results of said
-     * query are returned.  In that case, the paths are fulll paths because
+     * query are returned.  In that case, the paths are full paths because
      * files satisfying the query can be anywhere on the filesystem.
      *
      * @return Returns an array of strings naming the files and directories in
diff --git a/windows/src/com/lightcrafts/app/other/WindowsApplication.java b/windows/src/com/lightcrafts/app/other/WindowsApplication.java
index c7d6e917f..40bed2ef0 100755
--- a/windows/src/com/lightcrafts/app/other/WindowsApplication.java
+++ b/windows/src/com/lightcrafts/app/other/WindowsApplication.java
@@ -20,7 +20,7 @@ public abstract class WindowsApplication extends OtherApplication {
      * @param exe The name of the application executable (including the
      * <code>.exe</code> extension).
      * @return Returns said {@link OtherApplication} or
-     * {@link UnknownApplication#INSTANCE} if the other application is unkown.
+     * {@link UnknownApplication#INSTANCE} if the other application is unknown.
      */
     public static OtherApplication getAppForExe( String exe ) {
         final OtherApplication app = m_exeToApp.get( exe.toLowerCase() );