diff --git a/libtcc1.c b/libtcc1.c
index 412629e..f244206 100644
--- a/libtcc1.c
+++ b/libtcc1.c
@@ -418,19 +418,19 @@ unsigned long long __umoddi3(unsigned long long u, unsigned long long v)
     return w;
 }
 
-/* XXX: suppress that and patch tcc to do it */
+/* XXX: fix tcc's code generator to do this instead */
 long long __sardi3(long long a, int b)
 {
     return a >> b;
 }
 
-/* XXX: suppress that and patch tcc to do it */
+/* XXX: fix tcc's code generator to do this instead */
 unsigned long long __shrdi3(unsigned long long a, int b)
 {
     return a >> b;
 }
 
-/* XXX: suppress that and patch tcc to do it */
+/* XXX: fix tcc's code generator to do this instead */
 long long __shldi3(long long a, int b)
 {
     return a << b;
@@ -439,11 +439,11 @@ long long __shldi3(long long a, int b)
 #if defined(__i386__)
 /* FPU control word for rounding to nearest mode */
 unsigned short __tcc_fpu_control = 0x137f;
-/* FPU control word for round to zero mode for int convertion */
+/* FPU control word for round to zero mode for int conversion */
 unsigned short __tcc_int_fpu_control = 0x137f | 0x0c00;
 #endif
 
-/* XXX: suppress that and patch tcc to do it */
+/* XXX: fix tcc's code generator to do this instead */
 float __ulltof(unsigned long long a)
 {
     DWunion uu; 
diff --git a/tcc.c b/tcc.c
index ccf57ba..9834fb3 100644
--- a/tcc.c
+++ b/tcc.c
@@ -266,7 +266,7 @@ static struct BufferedFile *file;
 static int ch, tok;
 static CValue tokc;
 static CString tokcstr; /* current parsed string, if any */
-/* additionnal informations about token */
+/* additional informations about token */
 static int tok_flags;
 #define TOK_FLAG_BOL   0x0001 /* beginning of line before */
 #define TOK_FLAG_BOF   0x0002 /* beginning of file before */
@@ -346,7 +346,7 @@ static int tcc_ext = 1;
 static int num_callers = 6;
 static const char **rt_bound_error_msg;
 
-/* XXX: suppress that ASAP */
+/* XXX: get rid of this ASAP */
 static struct TCCState *tcc_state;
 
 /* give the path of the tcc libraries */
@@ -813,7 +813,7 @@ void *dlsym(void *handle, const char *symbol)
 
 /* we use our own 'finite' function to avoid potential problems with
    non standard math libs */
-/* XXX: endianness dependant */
+/* XXX: endianness dependent */
 int ieee_finite(double d)
 {
     int *p = (int *)&d;
@@ -1200,7 +1200,7 @@ void error(const char *fmt, ...)
     if (s1->error_set_jmp_enabled) {
         longjmp(s1->error_jmp_buf, 1);
     } else {
-        /* XXX: suppress it someday */
+        /* XXX: eliminate this someday */
         exit(1);
     }
 }
@@ -2001,7 +2001,7 @@ void restore_parse_state(ParseState *s)
     tokc = s->tokc;
 }
 
-/* return the number of additionnal 'ints' necessary to store the
+/* return the number of additional 'ints' necessary to store the
    token */
 static inline int tok_ext_size(int t)
 {
@@ -3810,7 +3810,7 @@ static inline int *macro_twosharps(const int *macro_str)
         tok_str_add2(&macro_str1, t, &cval);
     }
     saved_macro_ptr = macro_ptr;
-    /* XXX: suppress the use of macro_ptr here */
+    /* XXX: get rid of the use of macro_ptr here */
     macro_ptr = (int *)macro_str;
     for(;;) {
         while (*macro_ptr == TOK_TWOSHARPS) {
@@ -4206,7 +4206,7 @@ void save_reg(int r)
             }
             /* mark that stack entry as being saved on the stack */
             if (p->r & VT_LVAL) {
-                /* also suppress the bounded flag because the
+                /* also clear the bounded flag because the
                    relocation address of the function was stored in
                    p->c.ul */
                 p->r = (p->r & ~(VT_VALMASK | VT_BOUNDED)) | VT_LLOCAL;
@@ -4802,7 +4802,7 @@ void gen_opl(int op)
 }
 
 /* handle integer constant optimizations and various machine
-   independant opt */
+   independent opt */
 void gen_opic(int op)
 {
     int fc, c1, c2, n;
@@ -5313,7 +5313,7 @@ static void gen_cast(CType *type)
                 gen_cvt_ftoi1(dbt);
             }
             if (dbt == VT_INT && (type->t & (VT_BTYPE | VT_UNSIGNED)) != dbt) {
-                /* additionnal cast for char/short/bool... */
+                /* additional cast for char/short/bool... */
                 vtop->type.t = dbt;
                 gen_cast(type);
             }
@@ -5326,7 +5326,7 @@ static void gen_cast(CType *type)
                     else
                         vtop->c.ll = vtop->c.i;
                 } else {
-                    /* machine independant conversion */
+                    /* machine independent conversion */
                     gv(RC_INT);
                     /* generate high word */
                     if (sbt == (VT_INT | VT_UNSIGNED)) {
@@ -6929,7 +6929,7 @@ static void expr_or(void)
     }
 }
 
-/* XXX: suppress this mess */
+/* XXX: fix this mess */
 static void expr_land_const(void)
 {
     expr_or();
@@ -6940,7 +6940,7 @@ static void expr_land_const(void)
     }
 }
 
-/* XXX: suppress this mess */
+/* XXX: fix this mess */
 static void expr_lor_const(void)
 {
     expr_land_const();
@@ -7562,7 +7562,7 @@ static void decl_designator(CType *type, Section *sec, unsigned long c,
                 expect("field");
             if (!notfirst)
                 *cur_field = f;
-            /* XXX: suppress this mess by using explicit storage field */
+            /* XXX: fix this mess by using explicit storage field */
             type1 = f->type;
             type1.t |= (type->t & ~VT_TYPE);
             type = &type1;
@@ -7586,7 +7586,7 @@ static void decl_designator(CType *type, Section *sec, unsigned long c,
             f = *cur_field;
             if (!f)
                 error("too many field init");
-            /* XXX: suppress this mess by using explicit storage field */
+            /* XXX: fix this mess by using explicit storage field */
             type1 = f->type;
             type1.t |= (type->t & ~VT_TYPE);
             type = &type1;