diff --git a/doc/section_integrators.tex b/doc/section_integrators.tex
index 16e6a671..be1a7452 100644
--- a/doc/section_integrators.tex
+++ b/doc/section_integrators.tex
@@ -43,7 +43,7 @@ The following ``algorithm'' may help to decide amongst the remaining ones:
 \begin{enumerate}
 \item Try rendering the scene with an appropriate path tracer. If this gives the desired result, stop.
 
-Mitsuba currently comes with three path tracer variations that target different setups: It your
+Mitsuba currently comes with three path tracer variations that target different setups: If your
 scene contains no media and no surfaces with opacity masks, use the plain path tracer (\pluginref{path}).
 
 Otherwise, use one of the volumetric path tracers (\pluginref[volpathsimple]{volpath\_simple}
diff --git a/src/converter/mtsimport.cpp b/src/converter/mtsimport.cpp
index eba539ca..140a2a53 100644
--- a/src/converter/mtsimport.cpp
+++ b/src/converter/mtsimport.cpp
@@ -220,10 +220,10 @@ int mts_main(int argc, char **argv) {
 			XMLString::transcode(toCatch.getMessage()) << endl;
 		retval = -1;
 	} catch (const std::exception &e) {
-		std::cerr << "Caught a critical exeption: " << e.what() << endl;
+		std::cerr << "Caught a critical exception: " << e.what() << endl;
 		retval = -1;
 	} catch (...) {
-		std::cerr << "Caught a critical exeption of unknown type!" << endl;
+		std::cerr << "Caught a critical exception of unknown type!" << endl;
 		retval = -1;
 	}
 
diff --git a/src/emitters/point.cpp b/src/emitters/point.cpp
index e2b2c3a6..5b286e3d 100644
--- a/src/emitters/point.cpp
+++ b/src/emitters/point.cpp
@@ -48,7 +48,7 @@ MTS_NAMESPACE_BEGIN
  *     }
  * }
  *
- * This sensor plugin implements a simple point light source, which
+ * This emitter plugin implements a simple point light source, which
  * uniformly radiates illumination into all directions.
  */
 
diff --git a/src/integrators/path/volpath.cpp b/src/integrators/path/volpath.cpp
index 788c3c8e..ec85df18 100644
--- a/src/integrators/path/volpath.cpp
+++ b/src/integrators/path/volpath.cpp
@@ -56,7 +56,7 @@ static StatsCounter avgPathLength("Volumetric path tracer", "Average path length
  *
  * This integrator has special support for \emph{index-matched} transmission
  * events (i.e. surface scattering events that do not change the direction
- * of light). As a consequence, particating media enclosed by a stencil shape (see
+ * of light). As a consequence, participating media enclosed by a stencil shape (see
  * \secref{shapes} for details) are rendered considerably more efficiently when this
  * shape has \emph{no}\footnote{this is what signals to Mitsuba that the boundary is
  * index-matched and does not interact with light in any way. Alternatively,
diff --git a/src/integrators/path/volpath_simple.cpp b/src/integrators/path/volpath_simple.cpp
index e7f3bde9..b35bdc2b 100644
--- a/src/integrators/path/volpath_simple.cpp
+++ b/src/integrators/path/volpath_simple.cpp
@@ -58,7 +58,7 @@ static StatsCounter avgPathLength("Volumetric path tracer", "Average path length
  *
  * This integrator has special support for \emph{index-matched} transmission
  * events (i.e. surface scattering events that do not change the direction
- * of light). As a consequence, particating media enclosed by a stencil shape (see
+ * of light). As a consequence, participating media enclosed by a stencil shape (see
  * \secref{shapes} for details) are rendered considerably more efficiently when this
  * shape has \emph{no}\footnote{this is what signals to Mitsuba that the boundary is
  * index-matched and does not interact with light in any way. Alternatively,
diff --git a/src/medium/homogeneous.cpp b/src/medium/homogeneous.cpp
index 1376b350..2040bb06 100644
--- a/src/medium/homogeneous.cpp
+++ b/src/medium/homogeneous.cpp
@@ -55,8 +55,8 @@ MTS_NAMESPACE_BEGIN
  *
  * This class implements a flexible homogeneous participating
  * medium with support for arbitrary phase functions and various
- * medium sampling methods. It provides several ways of configuring
- * the medium properties. Either, a material preset can be loaded
+ * medium sampling methods. It provides two different ways of configuring
+ * the medium properties. One possibility is to load a material preset
  * using the \code{material} parameter---see \tblref{medium-coefficients}
  * for details. Alternatively, when specifying parameters by hand, they can either
  * be provided using the scattering and absorption coefficients, or
diff --git a/src/mitsuba/mitsuba.cpp b/src/mitsuba/mitsuba.cpp
index 4f003ab8..86e8a968 100644
--- a/src/mitsuba/mitsuba.cpp
+++ b/src/mitsuba/mitsuba.cpp
@@ -388,10 +388,10 @@ int mitsuba_app(int argc, char **argv) {
 
 		Statistics::getInstance()->printStats();
 	} catch (const std::exception &e) {
-		std::cerr << "Caught a critical exeption: " << e.what() << endl;
+		std::cerr << "Caught a critical exception: " << e.what() << endl;
 		return -1;
 	} catch (...) {
-		std::cerr << "Caught a critical exeption of unknown type!" << endl;
+		std::cerr << "Caught a critical exception of unknown type!" << endl;
 		return -1;
 	}
 
diff --git a/src/mitsuba/mtssrv.cpp b/src/mitsuba/mtssrv.cpp
index 1acefd02..0558b092 100644
--- a/src/mitsuba/mtssrv.cpp
+++ b/src/mitsuba/mtssrv.cpp
@@ -376,9 +376,9 @@ int mtssrv(int argc, char **argv) {
 		close(sock);
 #endif
 	} catch (const std::exception &e) {
-		std::cerr << "Caught a critical exeption: " << e.what() << endl;
+		std::cerr << "Caught a critical exception: " << e.what() << endl;
 	} catch (...) {
-		std::cerr << "Caught a critical exeption of unknown type!" << endl;
+		std::cerr << "Caught a critical exception of unknown type!" << endl;
 	}
 
 	/* Shutdown */
diff --git a/src/mitsuba/mtsutil.cpp b/src/mitsuba/mtsutil.cpp
index abf547fd..8d60be3f 100644
--- a/src/mitsuba/mtsutil.cpp
+++ b/src/mitsuba/mtsutil.cpp
@@ -375,9 +375,9 @@ int mtsutil(int argc, char **argv) {
 			return retval;
 		}
 	} catch (const std::exception &e) {
-		std::cerr << "Caught a critical exeption: " << e.what() << endl;
+		std::cerr << "Caught a critical exception: " << e.what() << endl;
 	} catch (...) {
-		std::cerr << "Caught a critical exeption of unknown type!" << endl;
+		std::cerr << "Caught a critical exception of unknown type!" << endl;
 	}
 
 	return 0;
diff --git a/src/subsurface/dipole.cpp b/src/subsurface/dipole.cpp
index ebf2b982..5bd914cd 100644
--- a/src/subsurface/dipole.cpp
+++ b/src/subsurface/dipole.cpp
@@ -178,13 +178,14 @@ static int irrOctreeIndex = 0;
  * rendering, these  illumination samples are convolved with the diffusion profile
  * using a fast hierarchical technique proposed by Jensen and Buhler \cite{Jensen2005Rapid}.
  *
- * There are several different ways of configuring the medium properties.
- * Either, a material preset can be loaded using the \code{material}
- * parameter---see \tblref{medium-coefficients} for details. Alternatively,
- * when specifying parameters by hand, they can either be provided using
- * the scattering and absorption coefficients, or by declaring the extinction
- * coefficient and single scattering albedo (whichever is more convenient).
- * Mixing these parameter initialization methods is not allowed.
+ * There are two different ways of configuring the medium properties.
+ * the medium properties.  One possibility is to load a material preset
+ * using the \code{material} parameter---see \tblref{medium-coefficients}
+ * for details. Alternatively, when specifying parameters by hand, they
+ * can either be provided using the scattering and absorption coefficients,
+ * or by declaring the extinction coefficient and single scattering albedo
+ * (whichever is more convenient). Mixing these parameter initialization
+ * methods is not allowed.
  *
  * All scattering parameters (named \code{sigma*}) should
  * be provided in inverse scene units. For instance, when a world-space