diff --git a/Makefile.am b/Makefile.am
index 946534d512007f514eb0c67c2489f22b5bb362c7..9d4f6371b7aa37a1750c5fb8dbed17f9ff48442e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 
 # This file is part of SWIFT.
-# Coypright (c) 2012 pedro.gonnet@durham.ac.uk.
+# Copyright (c) 2012 pedro.gonnet@durham.ac.uk.
 #               2015 matthieu.schaller@durham.ac.uk.
 # 
 # This program is free software: you can redistribute it and/or modify
diff --git a/examples/BigCosmoVolume/makeIC.py b/examples/BigCosmoVolume/makeIC.py
index d5d5392f07671cfc529b76bcb3d00c3f50d3cf52..c4699b5616a634456c245cc33c01987580da4728 100644
--- a/examples/BigCosmoVolume/makeIC.py
+++ b/examples/BigCosmoVolume/makeIC.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2015 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ # Copyright (c) 2015 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Lesser General Public License as published
diff --git a/examples/BigPerturbedBox/makeIC_fcc.py b/examples/BigPerturbedBox/makeIC_fcc.py
index b21cb61f9d6ef9678eeddcc45e07908fb79a4fb0..92bfd9ce24e0018c33c2f68455869ced35b845fa 100644
--- a/examples/BigPerturbedBox/makeIC_fcc.py
+++ b/examples/BigPerturbedBox/makeIC_fcc.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/GreshoVortex/makeIC.py b/examples/GreshoVortex/makeIC.py
index 324dcb65b21527f4e3868571d08fe7a0c9ff98a1..533199869ee325dd75831410f3e9f1181ae30ebd 100644
--- a/examples/GreshoVortex/makeIC.py
+++ b/examples/GreshoVortex/makeIC.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/GreshoVortex/solution.py b/examples/GreshoVortex/solution.py
index a3937d1d144975c8f0023f1b310ace06cbf6f6b2..5b282caf2d7f3311ddb595781fed74c51bb4819f 100644
--- a/examples/GreshoVortex/solution.py
+++ b/examples/GreshoVortex/solution.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c346e017393aa84bfb55f9c292357aa8f6c5e9b7..38ba3e7dbf5f904709683ae9ba883c83831f2000 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,6 @@
 
 # This file is part of SWIFT.
-# Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+# Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
 #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/examples/PertubedBox/makeIC.py b/examples/PertubedBox/makeIC.py
index fe32c6f10a0f836cfc351c87730fd6a32882bad8..81ae9e5909ec51cb640209ce759d618311ce811f 100644
--- a/examples/PertubedBox/makeIC.py
+++ b/examples/PertubedBox/makeIC.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/SedovBlast/makeIC.py b/examples/SedovBlast/makeIC.py
index abddc803bc6bcb92a0c44eb5ae4e2977a0281aca..9b4b5443f472edf5bb299ed5e7261d115c96293c 100644
--- a/examples/SedovBlast/makeIC.py
+++ b/examples/SedovBlast/makeIC.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/SedovBlast/makeIC_fcc.py b/examples/SedovBlast/makeIC_fcc.py
index 7e684504095e76c39e92f9b2f954b71aa573fb22..88cbaf8042323ea91ed7dd09b1bd63418aff3e3f 100644
--- a/examples/SedovBlast/makeIC_fcc.py
+++ b/examples/SedovBlast/makeIC_fcc.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/SedovBlast/rdf.py b/examples/SedovBlast/rdf.py
index 52b834f3947d1f992093dad9916a6164d5b3b0fa..7f932cc814dc36e14e1bef52e33cf5ed1f527dfd 100644
--- a/examples/SedovBlast/rdf.py
+++ b/examples/SedovBlast/rdf.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ from numpy import *
 
 # Input values?
 if len(sys.argv) < 3 :
-    print "Useage: " , sys.argv[0] , " <filename> <nr. bins>"
+    print "Usage: " , sys.argv[0] , " <filename> <nr. bins>"
     exit()
     
 # Get the input arguments
diff --git a/examples/SedovBlast/solution.py b/examples/SedovBlast/solution.py
index 947c9dde5a02cea1f0edcbc60b67f0e3490625c2..9335e22bdd76585e8d53d3dba9f9a435197f92fc 100644
--- a/examples/SedovBlast/solution.py
+++ b/examples/SedovBlast/solution.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/SodShock/makeIC.py b/examples/SodShock/makeIC.py
index bfd1ede773d0cec42c8b5d0e3a75223fd3abdb5d..8405b192697580e5d9bc586bba1c6fe1265552cf 100644
--- a/examples/SodShock/makeIC.py
+++ b/examples/SodShock/makeIC.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/SodShock/rhox.py b/examples/SodShock/rhox.py
index 36771c5c0d9dcdec99403249ea8a7bb1a4bc58c6..70493be3728cdeb27409a79f616fa3ec5bb9cdfd 100644
--- a/examples/SodShock/rhox.py
+++ b/examples/SodShock/rhox.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ from numpy import *
 
 # Input values?
 if len(sys.argv) < 3 :
-    print "Useage: " , sys.argv[0] , " <filename> <nr. bins>"
+    print "Usage: " , sys.argv[0] , " <filename> <nr. bins>"
     exit()
     
 # Get the input arguments
diff --git a/examples/SodShock/solution.py b/examples/SodShock/solution.py
index a5a1364d90d4af12f3ac051e23748d6228592258..39f25c625232eee9bae0300339955f775f3b46ed 100644
--- a/examples/SodShock/solution.py
+++ b/examples/SodShock/solution.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/UniformBox/makeIC.py b/examples/UniformBox/makeIC.py
index 2600d79a4a70de3e69fb76b82e11f6a4b72a73d2..9f740398164a3411453f5a55a011428ececaeb19 100644
--- a/examples/UniformBox/makeIC.py
+++ b/examples/UniformBox/makeIC.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
diff --git a/examples/main.c b/examples/main.c
index 2f9bdcd971901ec69fd315d58d3708384a56ddd7..1fb23bfbe714a9d88259f593f8da2c1a31a0b390 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -211,7 +211,7 @@ int main(int argc, char *argv[]) {
             (long int)sizeof(struct gpart));
   }
 
-  /* Initilaize unit system */
+  /* Initialize unit system */
   initUnitSystem(&us);
   if (myrank == 0) {
     message("Unit system: U_M = %e g.", us.UnitMass_in_cgs);
@@ -296,7 +296,7 @@ int main(int argc, char *argv[]) {
     // message( "cutoffs in [ %g %g ]." , s.h_min , s.h_max ); fflush(stdout);
   }
 
-  /* Verify that each particle is in it's propper cell. */
+  /* Verify that each particle is in it's proper cell. */
   if (myrank == 0) {
     icount = 0;
     space_map_cells_pre(&s, 0, &map_cellcheck, &icount);
@@ -405,7 +405,7 @@ int main(int argc, char *argv[]) {
 #endif
     }
 
-    /* Dump a line of agregate output. */
+    /* Dump a line of aggregate output. */
     /*     if (myrank == 0) { */
     /*       printf("%i %e %.16e %.16e %.16e %.3e %.3e %i %.3e %.3e", j, e.time,
      */
diff --git a/examples/plot_tasks.py b/examples/plot_tasks.py
index 3e01be7da31ff87ba137cae394a203d5a6de7b25..52f1a90592120e61bd3e789ee0cb8fe7edb63a8d 100644
--- a/examples/plot_tasks.py
+++ b/examples/plot_tasks.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2015 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ # Copyright (c) 2015 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  #                    Bert Vandenbroucke (bert.vandenbroucke@ugent.be)
  #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
diff --git a/src/Makefile.am b/src/Makefile.am
index 789eff21b78f22a951f9ff5df1086019ff3fe44b..0fdc51571424e2a9ad91d1d7c714d91446702161 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 
 # This file is part of SWIFT.
-# Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+# Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
 #                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/src/atomic.h b/src/atomic.h
index 16b268c4c799cd1ca8c38a3382df912a9d618614..818d210e60a7aacdf61d12b60623ce87e62c9ed2 100644
--- a/src/atomic.h
+++ b/src/atomic.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/cell.c b/src/cell.c
index 87b51ac82cade8a7e4302e52b7a4e55e5d612aa2..a1653ae0d0b88cc1f09a8dc55daff2929453a58e 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -299,7 +299,7 @@ int cell_glocktree(struct cell *c) {
 }
 
 /**
- * @brief Unock a cell's parents.
+ * @brief Unlock a cell's parents.
  *
  * @param c The #cell.
  */
diff --git a/src/cell.h b/src/cell.h
index 7a5353bcae8cbb7ab4d50a546665a1a774a46aea..d5d8b5db8ba3005eb3bdeaee5789fe8d7e39480f 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/common_io.c b/src/common_io.c
index a09f9c9ac37d280a4ae2838b3b7e36556e81047a..6ed22a582016f2bd6506a193a75c21988e1c5553 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
@@ -218,7 +218,7 @@ void writeStringAttribute(hid_t grp, char* name, const char* str, int length) {
 
 /**
  * @brief Writes a double value as an attribute
- * @param grp The groupm in which to write
+ * @param grp The group in which to write
  * @param name The name of the attribute
  * @param data The value to write
  */
@@ -228,7 +228,7 @@ void writeAttribute_d(hid_t grp, char* name, double data) {
 
 /**
  * @brief Writes a float value as an attribute
- * @param grp The groupm in which to write
+ * @param grp The group in which to write
  * @param name The name of the attribute
  * @param data The value to write
  */
@@ -238,7 +238,7 @@ void writeAttribute_f(hid_t grp, char* name, float data) {
 
 /**
  * @brief Writes an int value as an attribute
- * @param grp The groupm in which to write
+ * @param grp The group in which to write
  * @param name The name of the attribute
  * @param data The value to write
  */
@@ -249,7 +249,7 @@ void writeAttribute_i(hid_t grp, char* name, int data) {
 
 /**
  * @brief Writes a long value as an attribute
- * @param grp The groupm in which to write
+ * @param grp The group in which to write
  * @param name The name of the attribute
  * @param data The value to write
  */
@@ -259,7 +259,7 @@ void writeAttribute_l(hid_t grp, char* name, long data) {
 
 /**
  * @brief Writes a string value as an attribute
- * @param grp The groupm in which to write
+ * @param grp The group in which to write
  * @param name The name of the attribute
  * @param str The string to write
  */
diff --git a/src/common_io.h b/src/common_io.h
index c58ffae4d76dafe71faf44395f7f280120f4f0fe..c221ad3aaf84deb83c0067ee4ece729b98003430 100644
--- a/src/common_io.h
+++ b/src/common_io.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/const.h b/src/const.h
index ccccf6fa89884328efb33fcb018e0b17228fceff..d62673332c2d19872cad1d9c62ca6eff7f0e013a 100644
--- a/src/const.h
+++ b/src/const.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (ptcedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (ptcedro.gonnet@durham.ac.uk)
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/debug.c b/src/debug.c
index d55d5443457fe3be41f6d1983a1eca8d7ab99f3c..f245e881d718c27c075a6ae13d62a49d43b5f7e9 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Matthieu Schaller (matthieu.schaller@durham.ac.uk),
+ * Copyright (c) 2013 Matthieu Schaller (matthieu.schaller@durham.ac.uk),
  *                    Pedro Gonnet (pedro.gonnet@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/debug.h b/src/debug.h
index 5c9eb7b32db8ef5d07d97b867c68ec09b848e337..83461df45e3c0fb137557fba5fdf68cac9d4915a 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
+ * Copyright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/engine.c b/src/engine.c
index c4f5dccad5c829efd3b1b50211c4f6a06a28e198..9f1953fd3661a3fa54f167d28743de0d8c4cf26b 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -127,7 +127,7 @@ void engine_mkghosts(struct engine *e, struct cell *c, struct cell *super) {
 }
 
 /**
- * @brief Redistribute the particles amongst the nodes accorind
+ * @brief Redistribute the particles amongst the nodes according
  *      to their cell's node IDs.
  *
  * @param e The #engine.
@@ -454,7 +454,7 @@ void engine_repartition(struct engine *e) {
     for (k = 0; k < nr_cells; k++) weights_v[k] *= scale;
   }
 
-/* Merge the weights arrays accross all nodes. */
+/* Merge the weights arrays across all nodes. */
 #if IDXTYPEWIDTH == 32
   if ((res = MPI_Reduce((nodeID == 0) ? MPI_IN_PLACE : weights_v, weights_v,
                         nr_cells, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD)) !=
@@ -577,7 +577,7 @@ void engine_repartition(struct engine *e) {
   /* Now comes the tricky part: Exchange particles between all nodes.
      This is done in two steps, first allreducing a matrix of
      how many particles go from where to where, then re-allocating
-     the parts array, and emiting the sends and receives.
+     the parts array, and emitting the sends and receives.
      Finally, the space, tasks, and proxies need to be rebuilt. */
 
   /* Redistribute the particles between the nodes. */
@@ -765,7 +765,7 @@ void engine_exchange_cells(struct engine *e) {
     proxy_cells_exch2(&e->proxies[pid]);
   }
 
-  /* Wait for all the sends to have finnished too. */
+  /* Wait for all the sends to have finished too. */
   if (MPI_Waitall(nr_proxies, reqs_out, MPI_STATUSES_IGNORE) != MPI_SUCCESS)
     error("MPI_Waitall on sends failed.");
 
@@ -786,7 +786,7 @@ void engine_exchange_cells(struct engine *e) {
                            e->proxies[pid].cells_in[j], e->s);
   }
 
-  /* Wait for all the sends to have finnished too. */
+  /* Wait for all the sends to have finished too. */
   if (MPI_Waitall(nr_proxies, reqs_out, MPI_STATUSES_IGNORE) != MPI_SUCCESS)
     error("MPI_Waitall on sends failed.");
 
@@ -883,11 +883,11 @@ int engine_exchange_strays(struct engine *e, int offset, int *ind, int N) {
     proxy_parts_exch2(&e->proxies[pid]);
   }
 
-  /* Wait for all the sends to have finnished too. */
+  /* Wait for all the sends to have finished too. */
   if (MPI_Waitall(e->nr_proxies, reqs_out, MPI_STATUSES_IGNORE) != MPI_SUCCESS)
     error("MPI_Waitall on sends failed.");
 
-  /* Count the total number of incomming particles and make sure we have
+  /* Count the total number of incoming particles and make sure we have
      enough space to accommodate them. */
   int count_in = 0;
   for (k = 0; k < e->nr_proxies; k++) count_in += e->proxies[k].nr_parts_in;
@@ -954,7 +954,7 @@ int engine_exchange_strays(struct engine *e, int offset, int *ind, int N) {
     }
   }
 
-  /* Wait for all the sends to have finnished too. */
+  /* Wait for all the sends to have finished too. */
   if (nr_out > 0)
     if (MPI_Waitall(2 * e->nr_proxies, reqs_out, MPI_STATUSES_IGNORE) !=
         MPI_SUCCESS)
@@ -1207,7 +1207,7 @@ void engine_maketasks(struct engine *e) {
     /* Get a handle on the proxy. */
     struct proxy *p = &e->proxies[pid];
 
-    /* Loop through the proxy's incomming cells and add the
+    /* Loop through the proxy's incoming cells and add the
        recv tasks. */
     for (k = 0; k < p->nr_cells_in; k++)
       engine_addtasks_recv(e, p->cells_in[k], NULL, NULL);
@@ -1245,7 +1245,7 @@ int engine_marktasks(struct engine *e) {
   struct cell *ci, *cj;
   // ticks tic = getticks();
 
-  /* Muc less to do here if we're on a fixed time-step. */
+  /* Much less to do here if we're on a fixed time-step. */
   if (!(e->policy & engine_policy_multistep)) {
 
     /* Run through the tasks and mark as skip or not. */
@@ -1440,7 +1440,7 @@ void engine_prepare(struct engine *e) {
   int buff;
   if (MPI_Allreduce(&rebuild, &buff, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD) !=
       MPI_SUCCESS)
-    error("Failed to aggreggate the rebuild flag accross nodes.");
+    error("Failed to aggregate the rebuild flag across nodes.");
   rebuild = buff;
 // message( "rebuild allreduce took %.3f ms." , (double)(getticks() -
 // tic)/CPU_TPS*1000 );
@@ -1491,7 +1491,7 @@ void engine_barrier(struct engine *e, int tid) {
   /* Wait for the barrier to open. */
   while (e->barrier_launch == 0 || tid >= e->barrier_launchcount)
     if (pthread_cond_wait(&e->barrier_cond, &e->barrier_mutex) != 0)
-      error("Eror waiting for barrier to close.");
+      error("Error waiting for barrier to close.");
 
   /* This thread has been launched. */
   e->barrier_running += 1;
@@ -1708,7 +1708,7 @@ void engine_launch(struct engine *e, int nr_runners, unsigned int mask) {
 
 void hassorted(struct cell *c) {
 
-  if (c->sorted) error("Suprious sorted flags.");
+  if (c->sorted) error("Spurious sorted flags.");
 
   if (c->split)
     for (int k = 0; k < 8; k++)
@@ -2071,7 +2071,7 @@ void engine_split(struct engine *e, int *grid) {
  * @param nr_queues The number of task queues to create.
  * @param nr_nodes The number of MPI ranks
  * @param nodeID The MPI rank of this node
- * @param policy The queueing policy to use.
+ * @param policy The queuing policy to use.
  */
 
 void engine_init(struct engine *e, struct space *s, float dt, int nr_threads,
diff --git a/src/engine.h b/src/engine.h
index 65aa028401344f953d7a23a5c83c030278bbdcb7..26bd0eb9aee84251f253d6e6b8abcefe19bee2a2 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/error.h b/src/error.h
index 6dd6b2a93936b2821071cc96cce4bdd127b2e9ae..e478e4bfc9714bea30732f7542539752517e5fa2 100644
--- a/src/error.h
+++ b/src/error.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/inline.h b/src/inline.h
index 06728cb87f5e342b22d4a4a861cbd83ea6af31d9..c4dd9d59becabf54895b60cf3ac7ba809ac150c5 100644
--- a/src/inline.h
+++ b/src/inline.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/intrinsics.h b/src/intrinsics.h
index 4bb97e351f0a1e6dafe1c686e90f5038d98e7217..21b8c8e68bc45d8799db496ff30ac0cfb289acea 100644
--- a/src/intrinsics.h
+++ b/src/intrinsics.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2015 Matthieu Schaller matthieu.schaller@durham.ac.uk)
+ * Copyright (c) 2015 Matthieu Schaller matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -24,7 +24,7 @@
  * significant bit position. If x is 0, the result is undefined.
  *
  * This is a wrapper for the GCC intrinsics with an implementation (from
- * Hacker's Delight) if the compiler intrisincs are not available.
+ * Hacker's Delight) if the compiler intrinsics are not available.
  */
 __attribute__((always_inline))
     INLINE static int intrinsics_clz(unsigned int x) {
@@ -64,7 +64,7 @@ __attribute__((always_inline))
  * @brief Returns the number of 1-bits in x.
  *
  * This is a wrapper for the GCC intrinsics with an implementation (from
- * Hacker's Delight) if the compiler intrisincs are not available.
+ * Hacker's Delight) if the compiler intrinsics are not available.
  */
 __attribute__((always_inline))
     INLINE static int intrinsics_popcount(unsigned int x) {
diff --git a/src/kernel.h b/src/kernel.h
index 61896b4af15eb9a765fcbfdbc43485a588c7297d..d55e073479d1585f3677389939fa8e7c53dbe1c9 100644
--- a/src/kernel.h
+++ b/src/kernel.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/lock.h b/src/lock.h
index 19a4e74bf82d3b6bb8e305388ca42929cc9d719e..90e9f90602c120ddd10f4cdefb9b08cedbf45e0f 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/multipole.c b/src/multipole.c
index 439e9cd5f0218bddf28d228de6eb3bb14a2d6735..fc4701fead68e64e8742730325931282f80e8934 100644
--- a/src/multipole.c
+++ b/src/multipole.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/multipole.h b/src/multipole.h
index ffa5d713f507b85f6ae9216cfe81d4fc49316345..91ba6df965ce9d3b088d538411b7f0a8555ba0e4 100644
--- a/src/multipole.h
+++ b/src/multipole.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/parallel_io.c b/src/parallel_io.c
index 8ffd59a591f4f035d912156be08c33ef90b5d8ee..acba06748a9fcd1c082f81cb940a3d6301ab8a9e 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
@@ -47,14 +47,14 @@
  * @param type The #DATA_TYPE of the attribute.
  * @param N The number of particles.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part_c A (char*) pointer on the first occurence of the field of
+ * @param part_c A (char*) pointer on the first occurrence of the field of
  *interest in the parts array
  * @param importance If COMPULSORY, the data must be present in the IC file. If
  *OPTIONAL, the array will be zeroed when the data is not present.
  *
- * @todo A better version using HDF5 hyperslabs to read the file directly into
+ * @todo A better version using HDF5 hyper-slabs to read the file directly into
  *the part array
- * will be written once the strucutres have been stabilized.
+ * will be written once the structures have been stabilized.
  *
  * Calls #error() if an error occurs.
  */
@@ -102,7 +102,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
   temp = malloc(N * dim * typeSize);
   if (temp == NULL) error("Unable to allocate memory for temporary buffer");
 
-  /* Prepare information for hyperslab */
+  /* Prepare information for hyper-slab */
   if (dim > 1) {
     rank = 2;
     shape[0] = N;
@@ -120,7 +120,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
   /* Create data space in memory */
   h_memspace = H5Screate_simple(rank, shape, NULL);
 
-  /* Select hyperslab in file */
+  /* Select hyper-slab in file */
   h_filespace = H5Dget_space(h_data);
   H5Sselect_hyperslab(h_filespace, H5S_SELECT_SET, offsets, NULL, shape, NULL);
 
@@ -185,7 +185,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
  * in the file.
  *
  * @warning Can not read snapshot distributed over more than 1 file !!!
- * @todo Read snaphsots distributed in more than one file.
+ * @todo Read snapshots distributed in more than one file.
  *
  * Calls #error() if an error occurs.
  *
@@ -309,14 +309,14 @@ void read_ic_parallel(char* fileName, double dim[3], struct part** parts,
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
  * @param N_total Total number of particles across all cores
  * @param offset Offset in the array where this mpi task starts writing
- * @param part_c A (char*) pointer on the first occurence of the field of
+ * @param part_c A (char*) pointer on the first occurrence of the field of
  *interest in the parts array
  * @param us The UnitSystem currently in use
  * @param convFactor The UnitConversionFactor for this array
  *
- * @todo A better version using HDF5 hyperslabs to write the file directly from
+ * @todo A better version using HDF5 hyper-slabs to write the file directly from
  *the part array
- * will be written once the strucutres have been stabilized.
+ * will be written once the structures have been stabilized.
  *
  * Calls #error() if an error occurs.
  */
@@ -416,8 +416,8 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
   conversionString(buffer, us, convFactor);
   writeAttribute_d(h_data, "CGS conversion factor",
                    conversionFactor(us, convFactor));
-  writeAttribute_f(h_data, "h-scale exponant", hFactor(us, convFactor));
-  writeAttribute_f(h_data, "a-scale exponant", aFactor(us, convFactor));
+  writeAttribute_f(h_data, "h-scale exponent", hFactor(us, convFactor));
+  writeAttribute_f(h_data, "a-scale exponent", aFactor(us, convFactor));
   writeAttribute_s(h_data, "Conversion factor", buffer);
 
   /* Free and close everything */
@@ -441,7 +441,7 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
  * @param N_total Total number of particles across all cores
  * @param mpi_rank The MPI task rank calling the function
  * @param offset Offset in the array where this mpi task starts writing
- * @param part A (char*) pointer on the first occurence of the field of interest
+ * @param part A (char*) pointer on the first occurrence of the field of interest
  *in the parts array
  * @param field The name (code name) of the field to read from.
  * @param us The UnitSystem currently in use
@@ -511,7 +511,7 @@ void write_output_parallel(struct engine* e, struct UnitSystem* us,
   MPI_Bcast(&N_total_d, 1, MPI_DOUBLE, mpi_size - 1, comm);
   if (N_total_d > 1.e15)
     error(
-        "Error while computing the offest for parallel output: Simulation has "
+        "Error while computing the offset for parallel output: Simulation has "
         "more than 10^15 particles.\n");
   N_total = (long long)N_total_d;
   offset = (long long)offset_d;
diff --git a/src/parallel_io.h b/src/parallel_io.h
index fa46a230ab73e52a3b471dc0b157f5cf0f99ef73..5ee2714a18dbabdd5fc8c07c0b444e04a87ad4f8 100644
--- a/src/parallel_io.h
+++ b/src/parallel_io.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
+ * Copyright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/part.h b/src/part.h
index 380c2dedb2d7847c0d0efe937d0b24feb0a736f0..37070bdce52d8b5ef7b3ebca7dadb5ef918c85b5 100644
--- a/src/part.h
+++ b/src/part.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/proxy.c b/src/proxy.c
index 257a11593d674a3f8a5674670ac3a12f203e1eb2..7d2e546bf945ca18c2195ea2801d1b2058cb2f58 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -142,7 +142,7 @@ void proxy_addcell_in(struct proxy *p, struct cell *c) {
   if (p->nr_cells_in == p->size_cells_in) {
     p->size_cells_in *= proxy_buffgrow;
     if ((temp = malloc(sizeof(struct cell *) * p->size_cells_in)) == NULL)
-      error("Failed to allocate ingoing cell list.");
+      error("Failed to allocate incoming cell list.");
     memcpy(temp, p->cells_in, sizeof(struct cell *) * p->nr_cells_in);
     free(p->cells_in);
     p->cells_in = temp;
diff --git a/src/proxy.h b/src/proxy.h
index 8cb08d0a66095597227b52b317f3808190cdc45f..3cd33e0f0819ee1ecac53213630445b39c809dea 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -40,7 +40,7 @@ struct proxy {
   /* ID of the node this proxy represents. */
   int mynodeID, nodeID;
 
-  /* Incomming cells. */
+  /* Incoming cells. */
   struct cell **cells_in;
   struct pcell *pcells_in;
   int nr_cells_in, size_cells_in, size_pcells_in;
diff --git a/src/queue.c b/src/queue.c
index 3fa0096bf0fab8ecc6ec2508d5a7c2529451e54d..4e5330518c3d067a3e8a8ce7806e3560a41cc8ef 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/queue.h b/src/queue.h
index 533007684fa41a4a25a10a14c504358926d0fe06..d81627b4c4a709498c31c6c6152d3650388020e2 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/runner.c b/src/runner.c
index e1956ebe9a8125c95e1109dfa9ee0211fbecdea4..552e02e4fdc9d48b8e9c9b72119d53e75639ad78 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -536,7 +536,7 @@ void runner_doghost(struct runner *r, struct cell *c) {
       /* Get a direct pointer on the part. */
       p = &parts[pid[i]];
 
-      /* Is this part within the timestep? */
+      /* Is this part within the time step? */
       if (p->dt <= dt_step) {
 
         /* Some smoothing length multiples. */
@@ -620,7 +620,7 @@ void runner_doghost(struct runner *r, struct cell *c) {
         alpha_dot = (const_viscosity_alpha_min - p->alpha) / tau +
                     (const_viscosity_alpha_max - p->alpha) * S;
 
-        /* Update particle's viscosity paramter */
+        /* Update particle's viscosity parameter */
         p->alpha += alpha_dot * p->dt;
 #endif
 
@@ -932,7 +932,7 @@ void runner_dokick1(struct runner *r, struct cell *c) {
 
   }
 
-  /* Otherwise, agregate data from children. */
+  /* Otherwise, aggregate data from children. */
   else {
 
     /* Init with the first non-null child. */
@@ -1045,7 +1045,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) {
       xp->v_hdt[2] = (v_hdt[2] += dt * a[2]);
       xp->u_hdt = (u_hdt += dt * u_dt);
 
-      /* Move the particles with the velocitie at the half-step. */
+      /* Move the particles with the velocity at the half-step. */
       p->x[0] = x[0] += dt * v_hdt[0];
       p->x[1] = x[1] += dt * v_hdt[1];
       p->x[2] = x[2] += dt * v_hdt[2];
@@ -1103,7 +1103,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) {
 
   }
 
-  /* Otherwise, agregate data from children. */
+  /* Otherwise, aggregate data from children. */
   else {
 
     /* Init with the first non-null child. */
diff --git a/src/runner.h b/src/runner.h
index 30e75bd6ad21d45baf328adef23d2b500015ce9b..1ad348ccceea1549fe0d04bf7cac06dfed9b19bc 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index 017529cc94021ee9ea38ce543ac8a3c4dea2e1db..8653a70c79a9b87616d95ac323d701f60b04b36e 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -1299,7 +1299,7 @@ void DOPAIR2(struct runner *r, struct cell *ci, struct cell *cj) {
 
           } else {
 
-            /* Add this interaction to the non-summetric queue. */
+            /* Add this interaction to the non-symmetric queue. */
             r2q1[icount1] = r2;
             dxq1[3 * icount1 + 0] = dx[0];
             dxq1[3 * icount1 + 1] = dx[1];
@@ -1818,7 +1818,7 @@ void DOSUB1(struct runner *r, struct cell *ci, struct cell *cj, int sid,
 
     }
 
-    /* Otherwsie, compute self-interaction. */
+    /* Otherwise, compute self-interaction. */
     else
       DOSELF1(r, ci);
 
@@ -2093,7 +2093,7 @@ void DOSUB2(struct runner *r, struct cell *ci, struct cell *cj, int sid,
 
     }
 
-    /* Otherwsie, compute self-interaction. */
+    /* Otherwise, compute self-interaction. */
     else
       DOSELF2(r, ci);
 
@@ -2382,7 +2382,7 @@ void DOSUB_SUBSET(struct runner *r, struct cell *ci, struct part *parts,
 
     }
 
-    /* Otherwsie, compute self-interaction. */
+    /* Otherwise, compute self-interaction. */
     else
       DOSELF_SUBSET(r, ci, parts, ind, count);
 
diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h
index 98fd23585768b4594e84099177a5d291912230cb..ee5c31cc15f42dc5a3f2b154df0aba2fa09210b5 100644
--- a/src/runner_doiact_grav.h
+++ b/src/runner_doiact_grav.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -241,7 +241,7 @@ void runner_dograv_up(struct runner *r, struct cell *c) {
 
 /**
  * @brief Compute the recursive downward sweep, i.e. apply the multipole
- *        accelleration on all the particles.
+ *        acceleration on all the particles.
  *
  * @param r The #runner.
  * @param c The top-level #cell.
@@ -254,7 +254,7 @@ void runner_dograv_down(struct runner *r, struct cell *c) {
   /* Split? */
   if (c->split) {
 
-    /* Apply this cell's accelleration on the multipoles below. */
+    /* Apply this cell's acceleration on the multipoles below. */
     for (int k = 0; k < 8; k++)
       if (c->progeny[k] != NULL) {
         struct multipole *mp = &c->progeny[k]->multipole;
@@ -272,7 +272,7 @@ void runner_dograv_down(struct runner *r, struct cell *c) {
   /* No, leaf node. */
   else {
 
-    /* Apply the multipole accelleration to all gparts. */
+    /* Apply the multipole acceleration to all gparts. */
     for (int k = 0; k < c->gcount; k++) {
       struct gpart *p = &c->gparts[k];
       p->a[0] += m->a[0];
@@ -590,7 +590,7 @@ void runner_dosub_grav(struct runner *r, struct cell *ci, struct cell *cj,
     theta = (dx[0] * dx[0] + dx[1] * dx[1] + dx[2] * dx[2]) /
             (ci->h[0] * ci->h[0] + ci->h[1] * ci->h[1] + ci->h[2] * ci->h[2]);
 
-    /* Split the interacton? */
+    /* Split the interaction? */
     if (theta < const_theta_max * const_theta_max) {
 
       /* Are both ci and cj split? */
diff --git a/src/runner_iact.h b/src/runner_iact.h
index e1561132af3fff847989af34c268dfb1069ed40d..f1828eaf106b0ee94435fcaa90ea1feb3485b5d8 100644
--- a/src/runner_iact.h
+++ b/src/runner_iact.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -421,7 +421,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_force(
   /* Apply balsara switch */
   Pi_ij *= (pi->force.balsara + pj->force.balsara);
 
-  /* Termal conductivity */
+  /* Thermal conductivity */
   v_sig_u = sqrtf(2.f * (const_hydro_gamma - 1.f) *
                   fabs(rhoi * pi->u - rhoj * pj->u) / (rhoi + rhoj));
   tc = const_conductivity_alpha * v_sig_u / (rhoi + rhoj);
@@ -622,7 +622,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_vec_force(
   Pi_ij.v = balsara.v * alpha_ij.v * v_sig.v * omega_ij.v / (pirho.v + pjrho.v);
   Pi_ij.v *= (wi_dr.v + wj_dr.v);
 
-  /* Termal conductivity */
+  /* Thermal conductivity */
   v_sig_u.v = vec_sqrt(vec_set1(2.f * (const_hydro_gamma - 1.f)) *
                        vec_fabs(pirho.v * piu.v - pjrho.v * pju.v) /
                        (pirho.v + pjrho.v));
@@ -737,7 +737,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
   /* Apply balsara switch */
   Pi_ij *= (pi->force.balsara + pj->force.balsara);
 
-  /* Termal conductivity */
+  /* Thermal conductivity */
   v_sig_u = sqrtf(2.f * (const_hydro_gamma - 1.f) *
                   fabs(rhoi * pi->u - rhoj * pj->u) / (rhoi + rhoj));
   tc = const_conductivity_alpha * v_sig_u / (rhoi + rhoj);
@@ -929,7 +929,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_vec_force(
   Pi_ij.v = balsara.v * alpha_ij.v * v_sig.v * omega_ij.v / (pirho.v + pjrho.v);
   Pi_ij.v *= (wi_dr.v + wj_dr.v);
 
-  /* Termal conductivity */
+  /* Thermal conductivity */
   v_sig_u.v = vec_sqrt(vec_set1(2.f * (const_hydro_gamma - 1.f)) *
                        vec_fabs(pirho.v * piu.v - pjrho.v * pju.v) /
                        (pirho.v + pjrho.v));
diff --git a/src/runner_iact_grav.h b/src/runner_iact_grav.h
index 2fd30c1c3854db56564300f0a3e1a13a6dc31251..e62be446e8263bf02e3fd73f902b28cb1c3b16cf 100644
--- a/src/runner_iact_grav.h
+++ b/src/runner_iact_grav.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -53,7 +53,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_grav(
   /* Scale the acceleration. */
   acc *= const_G * ir * ir * ir;
 
-  /* Aggregate the accellerations. */
+  /* Aggregate the accelerations. */
   for (k = 0; k < 3; k++) {
     w = acc * dx[k];
     pi->a[k] -= w * mj;
@@ -101,7 +101,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_vec_grav(
   /* Scale the acceleration. */
   acc.v *= vec_set1(const_G) * ir.v * ir.v * ir.v;
 
-  /* Aggregate the accellerations. */
+  /* Aggregate the accelerations. */
   for (k = 0; k < 3; k++) {
     w.v = acc.v * dx[k].v;
     ai.v = w.v * mj.v;
diff --git a/src/runner_iact_legacy.h b/src/runner_iact_legacy.h
index 42044caafc8686f4ce5f639bacc16f297f266868..5716cf4a7a84a9d9fcd4cef38a307e483389d4ab 100644
--- a/src/runner_iact_legacy.h
+++ b/src/runner_iact_legacy.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/scheduler.c b/src/scheduler.c
index 8b4c9264548552d00c61c7d3fb66884d1a5338ee..a8b2b5453f8f3249d0384e25899f8592613ad503 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -173,7 +173,7 @@ void scheduler_splittasks(struct scheduler *s) {
           /* Take a step back (we're going to recycle the current task)... */
           redo = 1;
 
-          /* Add the self taks. */
+          /* Add the self task. */
           for (k = 0; ci->progeny[k] == NULL; k++)
             ;
           t->ci = ci->progeny[k];
@@ -595,7 +595,7 @@ void scheduler_splittasks(struct scheduler *s) {
           /* Ignore this task if the cell has no gparts. */
           if (ci->gcount == 0 || cj->gcount == 0) t->type = task_type_none;
 
-          /* Split the interacton? */
+          /* Split the interaction? */
           else if (theta < const_theta_max * const_theta_max) {
 
             /* Are both ci and cj split? */
@@ -703,7 +703,7 @@ void scheduler_ranktasks(struct scheduler *s) {
   struct task *t, *tasks = s->tasks;
   int *tid = s->tasks_ind, nr_tasks = s->nr_tasks;
 
-  /* Run throught the tasks and get all the waits right. */
+  /* Run through the tasks and get all the waits right. */
   for (i = 0, k = 0; k < nr_tasks; k++) {
     tid[k] = k;
     for (j = 0; j < tasks[k].nr_unlock_tasks; j++)
@@ -761,7 +761,7 @@ void scheduler_reset(struct scheduler *s, int size) {
   /* Do we need to re-allocate? */
   if (size > s->size) {
 
-    /* Free exising task lists if necessary. */
+    /* Free existing task lists if necessary. */
     if (s->tasks != NULL) free(s->tasks);
     if (s->tasks_ind != NULL) free(s->tasks_ind);
 
@@ -800,7 +800,7 @@ void scheduler_reweight(struct scheduler *s) {
   float wscale = 0.001;
   // ticks tic;
 
-  /* Run throught the tasks backwards and set their waits and
+  /* Run through the tasks backwards and set their waits and
      weights. */
   // tic = getticks();
   for (k = nr_tasks - 1; k >= 0; k--) {
@@ -884,7 +884,7 @@ void scheduler_start(struct scheduler *s, unsigned int mask) {
   struct task *t, *tasks = s->tasks;
   // ticks tic;
 
-  /* Run throught the tasks and set their waits. */
+  /* Run through the tasks and set their waits. */
   // tic = getticks();
   for (k = nr_tasks - 1; k >= 0; k--) {
     t = &tasks[tid[k]];
@@ -971,7 +971,7 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
           MPI_Error_string(err, buff, &len);
           error("Failed to emit irecv for particle data (%s).", buff);
         }
-        // message( "recieving %i parts with tag=%i from %i to %i." ,
+        // message( "receiving %i parts with tag=%i from %i to %i." ,
         //     t->ci->count , t->flags , t->ci->nodeID , s->nodeID );
         // fflush(stdout);
         qid = 1 % s->nr_queues;
@@ -1110,7 +1110,7 @@ struct task *scheduler_unlock(struct scheduler *s, struct task *t) {
  * @brief Get a task, preferably from the given queue.
  *
  * @param s The #scheduler.
- * @param qid The ID of the prefered #queue.
+ * @param qid The ID of the preferred #queue.
  * @param super the super-cell
  *
  * @return A pointer to a #task or @c NULL if there are no available tasks.
@@ -1141,7 +1141,7 @@ struct task *scheduler_gettask(struct scheduler *s, int qid,
         if (res != NULL) break;
       }
 
-      /* If unsucessful, try stealing from the other queues. */
+      /* If unsuccessful, try stealing from the other queues. */
       if (s->flags & scheduler_flag_steal) {
         int count = 0, qids[nr_queues];
         for (k = 0; k < nr_queues; k++)
diff --git a/src/scheduler.h b/src/scheduler.h
index 620b712885a1653397b3e9fd0e632cc0e562cf19..fd30c76f56ec7ffceba8af10a96127ca2ffc0135 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2013 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/serial_io.c b/src/serial_io.c
index 19b895ca5be87aac8e39c1c1f81ad911e294d522..c2c19faef8c8a9ea8d3021a8bc07217ee17f8b89 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
@@ -55,14 +55,14 @@
  * @param type The #DATA_TYPE of the attribute.
  * @param N The number of particles.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part_c A (char*) pointer on the first occurence of the field of
+ * @param part_c A (char*) pointer on the first occurrence of the field of
  *interest in the parts array
  * @param importance If COMPULSORY, the data must be present in the IC file. If
  *OPTIONAL, the array will be zeroed when the data is not present.
  *
- * @todo A better version using HDF5 hyperslabs to read the file directly into
+ * @todo A better version using HDF5 hyper-slabs to read the file directly into
  *the part array
- * will be written once the strucutres have been stabilized.
+ * will be written once the structures have been stabilized.
  *
  * Calls #error() if an error occurs.
  */
@@ -111,7 +111,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
   temp = malloc(N * dim * typeSize);
   if (temp == NULL) error("Unable to allocate memory for temporary buffer");
 
-  /* Prepare information for hyperslab */
+  /* Prepare information for hyper-slab */
   if (dim > 1) {
     rank = 2;
     shape[0] = N;
@@ -129,7 +129,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
   /* Create data space in memory */
   h_memspace = H5Screate_simple(rank, shape, NULL);
 
-  /* Select hyperslab in file */
+  /* Select hyper-slab in file */
   h_filespace = H5Dget_space(h_data);
   H5Sselect_hyperslab(h_filespace, H5S_SELECT_SET, offsets, NULL, shape, NULL);
 
@@ -203,7 +203,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
  * in the file.
  *
  * @warning Can not read snapshot distributed over more than 1 file !!!
- * @todo Read snaphsots distributed in more than one file.
+ * @todo Read snapshots distributed in more than one file.
  *
  * Calls #error() if an error occurs.
  *
@@ -228,7 +228,7 @@ void read_ic_serial(char* fileName, double dim[3], struct part** parts, int* N,
     /* message("Opening file '%s' as IC.", fileName); */
     h_file = H5Fopen(fileName, H5F_ACC_RDONLY, H5P_DEFAULT);
     if (h_file < 0)
-      error("Error while opening file '%s' for inital read.", fileName);
+      error("Error while opening file '%s' for initial read.", fileName);
 
     /* Open header to read simulation properties */
     /* message("Reading runtime parameters..."); */
@@ -383,8 +383,8 @@ void prepareArray(hid_t grp, char* fileName, FILE* xmfFile, char* name,
   conversionString(buffer, us, convFactor);
   writeAttribute_d(h_data, "CGS conversion factor",
                    conversionFactor(us, convFactor));
-  writeAttribute_f(h_data, "h-scale exponant", hFactor(us, convFactor));
-  writeAttribute_f(h_data, "a-scale exponant", aFactor(us, convFactor));
+  writeAttribute_f(h_data, "h-scale exponent", hFactor(us, convFactor));
+  writeAttribute_f(h_data, "a-scale exponent", aFactor(us, convFactor));
   writeAttribute_s(h_data, "Conversion factor", buffer);
 
   H5Dclose(h_data);
@@ -401,7 +401,7 @@ void prepareArray(hid_t grp, char* fileName, FILE* xmfFile, char* name,
  * @param type The #DATA_TYPE of the array.
  * @param N The number of particles to write.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part_c A (char*) pointer on the first occurence of the field of
+ * @param part_c A (char*) pointer on the first occurrence of the field of
  *interest in the parts array
  * @param us The UnitSystem currently in use
  * @param convFactor The UnitConversionFactor for this array
@@ -432,7 +432,7 @@ void writeArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
   for (i = 0; i < N; ++i)
     memcpy(&temp_c[i * copySize], part_c + i * partSize, copySize);
 
-  /* Construct information for the hyperslab */
+  /* Construct information for the hyper-slab */
   if (dim > 1) {
     rank = 2;
     shape[0] = N;
@@ -488,7 +488,7 @@ void writeArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
  * @param type The #DATA_TYPE of the array.
  * @param N The number of particles to write.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part A (char*) pointer on the first occurence of the field of interest
+ * @param part A (char*) pointer on the first occurrence of the field of interest
  *in the parts array
  * @param field The name (code name) of the field to read from.
  * @param us The UnitSystem currently in use
@@ -541,7 +541,7 @@ void write_output_serial(struct engine* e, struct UnitSystem* us, int mpi_rank,
   MPI_Bcast(&N_total_d, 1, MPI_DOUBLE, mpi_size - 1, comm);
   if (N_total_d > 1.e15)
     error(
-        "Error while computing the offest for parallel output: Simulation has "
+        "Error while computing the offset for parallel output: Simulation has "
         "more than 10^15 particles.\n");
   N_total = (long long) N_total_d;
   offset = (long long) offset_d;
diff --git a/src/serial_io.h b/src/serial_io.h
index bb05fc61bdca1b0db36386e6773a034cc17ea6b9..e5ecca9c8cbafbbaf2e555c5c216b494e25cc922 100644
--- a/src/serial_io.h
+++ b/src/serial_io.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
+ * Copyright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/single_io.c b/src/single_io.c
index 0bdd9049b2dbb1d05479914e3f5e6791f5b4583d..9d3138d0a706e5316e8d58bcbf613f61c04d63fb 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
@@ -50,14 +50,14 @@
  * @param type The #DATA_TYPE of the attribute.
  * @param N The number of particles.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part_c A (char*) pointer on the first occurence of the field of
+ * @param part_c A (char*) pointer on the first occurrence of the field of
  *interest in the parts array
  * @param importance If COMPULSORY, the data must be present in the IC file. If
  *OPTIONAL, the array will be zeroed when the data is not present.
  *
- * @todo A better version using HDF5 hyperslabs to read the file directly into
+ * @todo A better version using HDF5 hyper-slabs to read the file directly into
  *the part array
- * will be written once the strucutres have been stabilized.
+ * will be written once the structures have been stabilized.
  *
  * Calls #error() if an error occurs.
  */
@@ -159,7 +159,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N,
  * in the file.
  *
  * @warning Can not read snapshot distributed over more than 1 file !!!
- * @todo Read snaphsots distributed in more than one file.
+ * @todo Read snapshots distributed in more than one file.
  *
  * Calls #error() if an error occurs.
  *
@@ -257,14 +257,14 @@ void read_ic_single(char* fileName, double dim[3], struct part** parts, int* N,
  * @param type The #DATA_TYPE of the array.
  * @param N The number of particles to write.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part_c A (char*) pointer on the first occurence of the field of
+ * @param part_c A (char*) pointer on the first occurrence of the field of
  *interest in the parts array
  * @param us The UnitSystem currently in use
  * @param convFactor The UnitConversionFactor for this array
  *
- * @todo A better version using HDF5 hyperslabs to write the file directly from
+ * @todo A better version using HDF5 hyper-slabs to write the file directly from
  *the part array
- * will be written once the strucutres have been stabilized.
+ * will be written once the structures have been stabilized.
  *
  * Calls #error() if an error occurs.
  */
@@ -334,8 +334,8 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
   conversionString(buffer, us, convFactor);
   writeAttribute_d(h_data, "CGS conversion factor",
                    conversionFactor(us, convFactor));
-  writeAttribute_f(h_data, "h-scale exponant", hFactor(us, convFactor));
-  writeAttribute_f(h_data, "a-scale exponant", aFactor(us, convFactor));
+  writeAttribute_f(h_data, "h-scale exponent", hFactor(us, convFactor));
+  writeAttribute_f(h_data, "a-scale exponent", aFactor(us, convFactor));
   writeAttribute_s(h_data, "Conversion factor", buffer);
 
   /* Free and close everything */
@@ -354,7 +354,7 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
  * @param type The #DATA_TYPE of the array.
  * @param N The number of particles to write.
  * @param dim The dimension of the data (1 for scalar, 3 for vector)
- * @param part A (char*) pointer on the first occurence of the field of interest
+ * @param part A (char*) pointer on the first occurrence of the field of interest
  *in the parts array
  * @param field The name (code name) of the field to read from.
  * @param us The UnitSystem currently in use
diff --git a/src/single_io.h b/src/single_io.h
index 91d229178bbd45df3ba358172d1f52c70008adb7..f6689901106a2cd5d85a873d4047e1d21edd3547 100644
--- a/src/single_io.h
+++ b/src/single_io.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
+ * Copyright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/space.c b/src/space.c
index f4d9cda9d367332ea179a5b144fbc9d169c0dd99..b4060ee580592f3ee6b16043611f72cbf10870c1 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -179,7 +179,7 @@ void space_regrid(struct space *s, double cell_max, int verbose) {
     float buff;
     if (MPI_Allreduce(&h_max, &buff, 1, MPI_FLOAT, MPI_MAX, MPI_COMM_WORLD) !=
         MPI_SUCCESS)
-      error("Failed to aggreggate the rebuild flag accross nodes.");
+      error("Failed to aggregate the rebuild flag across nodes.");
     h_max = buff;
   }
 #endif
@@ -992,7 +992,7 @@ void space_split(struct space *s, struct cell *c) {
     c->dt_max = dt_max;
   }
 
-  /* Set ownership accorind to the start of the parts array. */
+  /* Set ownership according to the start of the parts array. */
   c->owner = ((c->parts - s->parts) % s->nr_parts) * s->nr_queues / s->nr_parts;
 }
 
@@ -1088,7 +1088,7 @@ struct cell *space_getcell(struct space *s) {
 void space_init(struct space *s, double dim[3], struct part *parts, int N,
                 int periodic, double h_max, int verbose) {
 
-  /* Store eveything in the space. */
+  /* Store everything in the space. */
   s->dim[0] = dim[0];
   s->dim[1] = dim[1];
   s->dim[2] = dim[2];
diff --git a/src/space.h b/src/space.h
index c12ec46be968d713618c41db5ab1385ed147d33e..cace0a6d6d69e35990309934586c63d0f402f814 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/task.c b/src/task.c
index 949caab56c4c4d8a0e3c73d05014ebc5ad68657a..642e6833c48236395f20c20b8e83f93d74757ea0 100644
--- a/src/task.c
+++ b/src/task.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/task.h b/src/task.h
index 0d3a68e1e8a892d554f8fb83f8f16d7030d5a54c..dac6b76a3e0e70284e3bee383b89b24d0e6d4fbe 100644
--- a/src/task.h
+++ b/src/task.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/timers.c b/src/timers.c
index 01a77d7804241f108b092f7d6857c90be3861cd0..2501d347c8cea608650ece4c2883dab85ceee058 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/timers.h b/src/timers.h
index 38ca81222ffb33b1558dcc4d7ee3a0cc1a71cd20..8c6443825d7df5152c36cedd40aa3dd46727fb69 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
diff --git a/src/tools.h b/src/tools.h
index 301ab335cc783bae54edea836dfe255a772f3194..7354a51030fef3a1fc8445afce770f56d5866fd6 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -1,5 +1,7 @@
 /*******************************************************************************
  * This file is part of SWIFT.
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  * Copyright (c) 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/units.c b/src/units.c
index e802d73355c9f387ec5f40ba71e46d564a15ff25..8c9fd14452e9e1fdfe029ac89d22d7cd43aa0ef7 100644
--- a/src/units.c
+++ b/src/units.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
@@ -300,7 +300,7 @@ float aFactor(struct UnitSystem* us, enum UnitConversionFactor unit) {
 }
 
 /**
- * @brief Returns a string containg the exponants of the base units making up
+ * @brief Returns a string containing the exponents of the base units making up
  * the conversion factors
  */
 void conversionString(char* buffer, struct UnitSystem* us,
@@ -316,7 +316,7 @@ void conversionString(char* buffer, struct UnitSystem* us,
  * @brief Returns the conversion factor for a given unit (expressed in terms of
  * the 5 fundamental units) in the chosen unit system
  * @param us The unit system used
- * @param baseUnitsExponants The exponant of each base units required to form
+ * @param baseUnitsExponants The exponent of each base units required to form
  * the desired quantity. See conversionFactor() for a working example
  */
 double generalConversionFactor(struct UnitSystem* us,
@@ -334,7 +334,7 @@ double generalConversionFactor(struct UnitSystem* us,
  * @brief Returns the h factor exponentiation for a given unit (expressed in
  * terms of the 5 fundamental units)
  * @param us The unit system used
- * @param baseUnitsExponants The exponant of each base units required to form
+ * @param baseUnitsExponants The exponent of each base units required to form
  * the desired quantity. See conversionFactor() for a working example
  */
 float generalhFactor(struct UnitSystem* us, float baseUnitsExponants[5]) {
@@ -351,7 +351,7 @@ float generalhFactor(struct UnitSystem* us, float baseUnitsExponants[5]) {
  * @brief Returns the scaling factor exponentiation for a given unit (expressed
  * in terms of the 5 fundamental units)
  * @param us The unit system used
- * @param baseUnitsExponants The exponant of each base units required to form
+ * @param baseUnitsExponants The exponent of each base units required to form
  * the desired quantity. See conversionFactor() for a working example
  */
 float generalaFactor(struct UnitSystem* us, float baseUnitsExponants[5]) {
@@ -363,12 +363,12 @@ float generalaFactor(struct UnitSystem* us, float baseUnitsExponants[5]) {
 }
 
 /**
- * @brief Returns a string containg the exponants of the base units making up
+ * @brief Returns a string containing the exponents of the base units making up
  * the conversion factors (expressed in terms of the 5 fundamental units)
  * @param buffer The buffer in which to write (The buffer must be long enough,
  * 140 chars at most)
- * @param us The UnistSystem in use.
- * @param baseUnitsExponants The exponant of each base units required to form
+ * @param us The UnitsSystem in use.
+ * @param baseUnitsExponants The exponent of each base units required to form
  * the desired quantity. See conversionFactor() for a working example
  */
 void generalConversionString(char* buffer, struct UnitSystem* us,
diff --git a/src/units.h b/src/units.h
index 0523247b04f1d09c9974bae5afab8070590d77b1..1b977529784c1ef3069e1e932b16fd0b87073786 100644
--- a/src/units.h
+++ b/src/units.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
+ * Copyright (c) 2012 Matthieu Schaller (matthieu.schaller@durham.ac.uk).
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -143,14 +143,14 @@ float generalaFactor(struct UnitSystem* us, float baseUnitsExponants[5]);
 float aFactor(struct UnitSystem* us, enum UnitConversionFactor unit);
 
 /**
- * @brief Returns a string containg the exponants of the base units making up
+ * @brief Returns a string containing the exponents of the base units making up
  * the conversion factors (expressed in terms of the 5 fundamental units)
  */
 void generalConversionString(char* buffer, struct UnitSystem* us,
                              float baseUnitsExponants[5]);
 
 /**
- * @brief Returns a string containg the exponants of the base units making up
+ * @brief Returns a string containing the exponents of the base units making up
  * the conversion factors
  */
 void conversionString(char* buffer, struct UnitSystem* us,
diff --git a/src/vector.h b/src/vector.h
index cddc933ab1c64e537ce68fcb0a77e74bbe6818d3..8629b39725ebb7d800047116f45fb7ec6c6e7a1d 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *               2015 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 13c654cdec0d74d2d3d5523bcf90214a0bc9b176..00e90f3b86e31a59f5fe9c450daaf71fa795baa7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of SWIFT.
-# Coypright (c) 2015 matthieu.schaller@durham.ac.uk.
+# Copyright (c) 2015 matthieu.schaller@durham.ac.uk.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/makeInput.py b/tests/makeInput.py
index 3cb802e381855ee27fd4ec520276b51a900d634a..8d8c07faf1e528869616bf93fbb7ffe8bf196af0 100644
--- a/tests/makeInput.py
+++ b/tests/makeInput.py
@@ -1,6 +1,6 @@
 ###############################################################################
  # This file is part of SWIFT.
- # Coypright (c) 2015 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
+ # Copyright (c) 2015 Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Lesser General Public License as published
diff --git a/tests/testSingle.c b/tests/testSingle.c
index 36c219eebf214feaf775283834578c5a487d5e90..02c52160d0d442496629f1bb3947f89524964fb8 100644
--- a/tests/testSingle.c
+++ b/tests/testSingle.c
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
  *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  * 
  * This program is free software: you can redistribute it and/or modify