diff --git a/DotNet/AssemblyInfo.cs b/DotNet/AssemblyInfo.cs
index 0f427f5..5d426c6 100644
--- a/DotNet/AssemblyInfo.cs
+++ b/DotNet/AssemblyInfo.cs
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/DotNet/Caca.cs b/DotNet/Caca.cs
index dbead5c..175853e 100644
--- a/DotNet/Caca.cs
+++ b/DotNet/Caca.cs
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/DotNet/Cucul.cs b/DotNet/Cucul.cs
index 9979b94..96c8ac4 100644
--- a/DotNet/Cucul.cs
+++ b/DotNet/Cucul.cs
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/DotNet/test.cs b/DotNet/test.cs
index 3722b19..c8f1e98 100644
--- a/DotNet/test.cs
+++ b/DotNet/test.cs
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/caca.c b/caca/caca.c
index 1534929..59b4cf9 100644
--- a/caca/caca.c
+++ b/caca/caca.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/caca.h b/caca/caca.h
index 48ac942..0736265 100644
--- a/caca/caca.h
+++ b/caca/caca.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/caca0.c b/caca/caca0.c
index 74e7ca7..3827468 100644
--- a/caca/caca0.c
+++ b/caca/caca0.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/caca0.h b/caca/caca0.h
index 5ae146f..9f08e12 100644
--- a/caca/caca0.h
+++ b/caca/caca0.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/caca_internals.h b/caca/caca_internals.h
index 3cc9ccf..d98cced 100644
--- a/caca/caca_internals.h
+++ b/caca/caca_internals.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_cocoa.m b/caca/driver_cocoa.m
index 0821fea..890b9b0 100644
--- a/caca/driver_cocoa.m
+++ b/caca/driver_cocoa.m
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_conio.c b/caca/driver_conio.c
index 3568958..c7d44c5 100644
--- a/caca/driver_conio.c
+++ b/caca/driver_conio.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_gl.c b/caca/driver_gl.c
index c90e192..243c524 100644
--- a/caca/driver_gl.c
+++ b/caca/driver_gl.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_ncurses.c b/caca/driver_ncurses.c
index 13be0bc..dc3bb58 100644
--- a/caca/driver_ncurses.c
+++ b/caca/driver_ncurses.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_raw.c b/caca/driver_raw.c
index 84b349e..b4541b1 100644
--- a/caca/driver_raw.c
+++ b/caca/driver_raw.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_slang.c b/caca/driver_slang.c
index 72757d3..ded7870 100644
--- a/caca/driver_slang.c
+++ b/caca/driver_slang.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_vga.c b/caca/driver_vga.c
index 4655c2e..a1ab817 100644
--- a/caca/driver_vga.c
+++ b/caca/driver_vga.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_win32.c b/caca/driver_win32.c
index c07955e..26a5ef9 100644
--- a/caca/driver_win32.c
+++ b/caca/driver_win32.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/driver_x11.c b/caca/driver_x11.c
index 50232b5..c02ce44 100644
--- a/caca/driver_x11.c
+++ b/caca/driver_x11.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/event.c b/caca/event.c
index 5590be4..b9f934b 100644
--- a/caca/event.c
+++ b/caca/event.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/graphics.c b/caca/graphics.c
index 661822f..b69ee62 100644
--- a/caca/graphics.c
+++ b/caca/graphics.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/caca/time.c b/caca/time.c
index e4e5c75..275b244 100644
--- a/caca/time.c
+++ b/caca/time.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/attr.c b/cucul/attr.c
index 0d717a0..797c1c3 100644
--- a/cucul/attr.c
+++ b/cucul/attr.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/box.c b/cucul/box.c
index b9d8ecc..b188e4d 100644
--- a/cucul/box.c
+++ b/cucul/box.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/canvas.c b/cucul/canvas.c
index 7ba5a78..d75b348 100644
--- a/cucul/canvas.c
+++ b/cucul/canvas.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/charset.c b/cucul/charset.c
index c325fee..0468a85 100644
--- a/cucul/charset.c
+++ b/cucul/charset.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/conic.c b/cucul/conic.c
index 82eb80a..08900ce 100644
--- a/cucul/conic.c
+++ b/cucul/conic.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/cucul.c b/cucul/cucul.c
index 0bb59d0..e091dca 100644
--- a/cucul/cucul.c
+++ b/cucul/cucul.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/cucul.h b/cucul/cucul.h
index 2581a2e..56905a8 100644
--- a/cucul/cucul.h
+++ b/cucul/cucul.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/cucul_internals.h b/cucul/cucul_internals.h
index e40c4e8..32a967c 100644
--- a/cucul/cucul_internals.h
+++ b/cucul/cucul_internals.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/dither.c b/cucul/dither.c
index abca5d5..2c56f83 100644
--- a/cucul/dither.c
+++ b/cucul/dither.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/export.c b/cucul/export.c
index 1282837..00cdf36 100644
--- a/cucul/export.c
+++ b/cucul/export.c
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/font.c b/cucul/font.c
index a27a019..cc384a5 100644
--- a/cucul/font.c
+++ b/cucul/font.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/frame.c b/cucul/frame.c
index 633910b..0a2fd84 100644
--- a/cucul/frame.c
+++ b/cucul/frame.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/import.c b/cucul/import.c
index 9dd8fc3..eb56b3d 100644
--- a/cucul/import.c
+++ b/cucul/import.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/legacy.c b/cucul/legacy.c
index 9abed8b..9b293c9 100644
--- a/cucul/legacy.c
+++ b/cucul/legacy.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/line.c b/cucul/line.c
index 4f8fe08..d020531 100644
--- a/cucul/line.c
+++ b/cucul/line.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/transform.c b/cucul/transform.c
index 2b71c00..7290cb2 100644
--- a/cucul/transform.c
+++ b/cucul/transform.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cucul/triangle.c b/cucul/triangle.c
index 052a0b3..3dc1a06 100644
--- a/cucul/triangle.c
+++ b/cucul/triangle.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cxx/caca++.cpp b/cxx/caca++.cpp
index 8831944..6a243d1 100644
--- a/cxx/caca++.cpp
+++ b/cxx/caca++.cpp
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cxx/caca++.h b/cxx/caca++.h
index 11d6def..29ebc70 100644
--- a/cxx/caca++.h
+++ b/cxx/caca++.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cxx/cucul++.cpp b/cxx/cucul++.cpp
index 2c47c3f..0f35315 100644
--- a/cxx/cucul++.cpp
+++ b/cxx/cucul++.cpp
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cxx/cucul++.h b/cxx/cucul++.h
index d067e3a..e4d9d55 100644
--- a/cxx/cucul++.h
+++ b/cxx/cucul++.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/cxx/cxxtest.cpp b/cxx/cxxtest.cpp
index 6eebfc1..ccf56dc 100644
--- a/cxx/cxxtest.cpp
+++ b/cxx/cxxtest.cpp
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 094e0b7..455b48f 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -7,7 +7,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/kernel/kernel.h b/kernel/kernel.h
index ae9b390..15be8fe 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/python/pypycaca.c b/python/pypycaca.c
index ae55117..2a9e90c 100644
--- a/python/pypycaca.c
+++ b/python/pypycaca.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/python/pypycaca.h b/python/pypycaca.h
index e022fc6..12e540e 100644
--- a/python/pypycaca.h
+++ b/python/pypycaca.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This library is free software. It commes without any warranty, to
+ *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/aafire.c b/src/aafire.c
index eae2732..0256a80 100644
--- a/src/aafire.c
+++ b/src/aafire.c
@@ -6,10 +6,9 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
- *  the extent permitted by applicable law. You can redistribute it
- *  and/or modify it under the terms of the Do What The Fuck You Want
- *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  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 by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
diff --git a/src/cacademo.c b/src/cacademo.c
index 878545a..30dc9d7 100644
--- a/src/cacademo.c
+++ b/src/cacademo.c
@@ -7,7 +7,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/cacadraw.c b/src/cacadraw.c
index edb3240..72631fb 100644
--- a/src/cacadraw.c
+++ b/src/cacadraw.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/cacaplay.c b/src/cacaplay.c
index 4ac2f76..84c50da 100644
--- a/src/cacaplay.c
+++ b/src/cacaplay.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/cacaserver.c b/src/cacaserver.c
index c4dae18..f8ab80f 100644
--- a/src/cacaserver.c
+++ b/src/cacaserver.c
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/cacaview.c b/src/cacaview.c
index 086171d..b85f611 100644
--- a/src/cacaview.c
+++ b/src/cacaview.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/common-image.c b/src/common-image.c
index 1d98fc2..b80e452 100644
--- a/src/common-image.c
+++ b/src/common-image.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/common-image.h b/src/common-image.h
index 2afbfdd..4508024 100644
--- a/src/common-image.h
+++ b/src/common-image.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/src/img2irc.c b/src/img2irc.c
index c9311a8..587aad9 100644
--- a/src/img2irc.c
+++ b/src/img2irc.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/blit.c b/test/blit.c
index c508955..26a140b 100644
--- a/test/blit.c
+++ b/test/blit.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/colors.c b/test/colors.c
index eadd52f..f97f5ac 100644
--- a/test/colors.c
+++ b/test/colors.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/cucul.c b/test/cucul.c
index 32a425c..ff217bb 100644
--- a/test/cucul.c
+++ b/test/cucul.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/demo.c b/test/demo.c
index 398f4b6..019482f 100644
--- a/test/demo.c
+++ b/test/demo.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/dithering.c b/test/dithering.c
index 8e53562..d99ff92 100644
--- a/test/dithering.c
+++ b/test/dithering.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/event.c b/test/event.c
index 26fd37d..3c6a20c 100644
--- a/test/event.c
+++ b/test/event.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/export.c b/test/export.c
index 6b6ce32..b58005e 100644
--- a/test/export.c
+++ b/test/export.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/font.c b/test/font.c
index 5fe83f9..a9f58e3 100644
--- a/test/font.c
+++ b/test/font.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/font2tga.c b/test/font2tga.c
index 259354a..43f6fc9 100644
--- a/test/font2tga.c
+++ b/test/font2tga.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/frames.c b/test/frames.c
index ce57969..9a45695 100644
--- a/test/frames.c
+++ b/test/frames.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/fullwidth.c b/test/fullwidth.c
index b5ab426..0be77c9 100644
--- a/test/fullwidth.c
+++ b/test/fullwidth.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/gamma.c b/test/gamma.c
index c45e46a..16e87ca 100644
--- a/test/gamma.c
+++ b/test/gamma.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/hsv.c b/test/hsv.c
index fd85031..318e97b 100644
--- a/test/hsv.c
+++ b/test/hsv.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/import.c b/test/import.c
index c60d85a..5fca36f 100644
--- a/test/import.c
+++ b/test/import.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/input.c b/test/input.c
index 5d0b560..1e22170 100644
--- a/test/input.c
+++ b/test/input.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/spritedit.c b/test/spritedit.c
index 510cc87..4547b9a 100644
--- a/test/spritedit.c
+++ b/test/spritedit.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/swallow.c b/test/swallow.c
index ce8bfc3..5284758 100644
--- a/test/swallow.c
+++ b/test/swallow.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/text.c b/test/text.c
index 9c7eb80..a11a02d 100644
--- a/test/text.c
+++ b/test/text.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/transform.c b/test/transform.c
index efe719a..4ed94aa 100644
--- a/test/transform.c
+++ b/test/transform.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/truecolor.c b/test/truecolor.c
index 4c54f25..791d007 100644
--- a/test/truecolor.c
+++ b/test/truecolor.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/test/unicode.c b/test/unicode.c
index 0992899..db2b487 100644
--- a/test/unicode.c
+++ b/test/unicode.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/tools/makefont.c b/tools/makefont.c
index df5e025..7a3d516 100644
--- a/tools/makefont.c
+++ b/tools/makefont.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See
diff --git a/tools/optipal.c b/tools/optipal.c
index 5411534..23bcc14 100644
--- a/tools/optipal.c
+++ b/tools/optipal.c
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  This program is free software. It commes without any warranty, to
+ *  This program is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it
  *  and/or modify it under the terms of the Do What The Fuck You Want
  *  To Public License, Version 2, as published by Sam Hocevar. See