diff --git a/README.md b/README.md
index 6fc11242..58e8b82c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,14 @@
+[![GitHub Actions Status](https://github.com/python-cffi/cffi/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/python-cffi/cffi/actions/workflows/ci.yaml?query=branch%3Amain++)
+[![PyPI version](https://img.shields.io/pypi/v/cffi.svg)](https://pypi.org/project/cffi)
+[![Read the Docs](https://img.shields.io/badge/docs-latest-blue.svg)][Documentation]
+
+
 CFFI
 ====
 
 Foreign Function Interface for Python calling C code.
-Please see the [Documentation](http://cffi.readthedocs.org/) or uncompiled
-in the doc/ subdirectory.
+
+Please see the [Documentation] or uncompiled in the `doc/` subdirectory.
 
 Download
 --------
@@ -24,8 +29,11 @@ Contact
 Testing/development tips
 ------------------------
 
-To run tests under CPython, run the following in the source root directory::
+To run tests under CPython, run the following in the source root directory:
 
     pip install pytest
     pip install -e .  # editable install of CFFI for local development
     pytest c/ testing/
+
+
+[Documentation]: http://cffi.readthedocs.org/
diff --git a/doc/misc/design.rst b/doc/misc/design.rst
index 390049cb..1a9b680a 100644
--- a/doc/misc/design.rst
+++ b/doc/misc/design.rst
@@ -2,7 +2,7 @@
 Design decisions
 ================
 
-* Generally follow LuaJIT's ffi: http://luajit.org/ext_ffi.html
+* Generally follow `LuaJIT's ffi`_.
 
 * Be explicit: almost no automatic conversions.  Here is the set
   of automatic conversions: the various C integer types are
@@ -49,3 +49,6 @@ Design decisions
 * LuaJIT uses ``int[?]`` which pycparser doesn't accept.  I propose
   instead to use ``int[]`` for the same purpose (its use is anyway quite
   close to the C standard's use of ``int[]``).
+
+
+.. _LuaJIT's ffi: https://luajit.org/ext_ffi.html
diff --git a/doc/misc/parse_c_type.rst b/doc/misc/parse_c_type.rst
index 1d1029d0..a339a025 100644
--- a/doc/misc/parse_c_type.rst
+++ b/doc/misc/parse_c_type.rst
@@ -6,48 +6,48 @@ Global variable::
 
   _cffi_opcode_t _cffi_types[];
 
-Every _cffi_types entry is initially an odd integer.  At runtime, it
-is fixed to be a `CTypeDescrObject *` when the odd integer is
-interpreted and turned into a real <ctype> object.
-
-The generated C functions are listed in _cffi_globals, a sorted array
-of entries which get turned lazily into real <builtin function
-objects>.  Each entry in this array has an index in the _cffi_types
-array, which describe the function type (OP_FUNCTION opcode, see
-below).  We turn the odd integers describing argument and return types
+Every ``_cffi_types`` entry is initially an odd integer. At runtime, it
+is fixed to be a ``CTypeDescrObject *`` when the odd integer is
+interpreted and turned into a real ``<ctype>`` object.
+
+The generated C functions are listed in ``_cffi_globals``, a sorted array
+of entries which get turned lazily into real ``<builtin function
+objects>``. Each entry in this array has an index in the ``_cffi_types``
+array, which describe the function type (``OP_FUNCTION`` opcode, see
+below). We turn the odd integers describing argument and return types
 into real CTypeDescrObjects at the point where the entry is turned
 into a real builtin function object.
 
 The odd integers are "opcodes" that contain a type info in the lowest
-byte.  The remaining high bytes of the integer is an "arg" that depends
+byte. The remaining high bytes of the integer is an "arg" that depends
 on the type info:
 
 OP_PRIMITIVE
     the arg tells which primitive type it is (an index in some list)
 
 OP_POINTER
-    the arg is the index of the item type in the _cffi_types array.
+    the arg is the index of the item type in the ``_cffi_types`` array.
 
 OP_ARRAY
-    the arg is the index of the item type in the _cffi_types array.
+    the arg is the index of the item type in the ``_cffi_types`` array.
     followed by another opcode that contains (uintptr_t)length_of_array.
 
 OP_OPEN_ARRAY
-    for syntax like "int[]".  same as OP_ARRAY but without the length
+    for syntax like "int[]". same as OP_ARRAY but without the length
 
 OP_STRUCT_UNION
-    the arg is the index of the struct/union in _cffi_structs_unions
+    the arg is the index of the struct/union in ``_cffi_structs_unions``
 
 OP_ENUM
-    the arg is the index of the enum in _cffi_enums
+    the arg is the index of the enum in ``_cffi_enums``
 
 OP_TYPENAME
-    the arg is the index of the typename in _cffi_typenames
+    the arg is the index of the typename in ``_cffi_typenames``
 
 OP_FUNCTION
-    the arg is the index of the result type in _cffi_types.
+    the arg is the index of the result type in ``_cffi_types``.
     followed by other opcodes for the arguments.
-    terminated by OP_FUNCTION_END.
+    terminated by ``OP_FUNCTION_END``.
 
 OP_FUNCTION_END
     the arg's lowest bit is set if there is a "..." argument.
@@ -55,9 +55,9 @@ OP_FUNCTION_END
 OP_NOOP
     simple indirection: the arg is the index to look further in
 
-There are other opcodes, used not inside _cffi_types but in other
-individual ``type_op`` fields.  Most importantly, these are used
-on _cffi_globals entries:
+There are other opcodes, used not inside ``_cffi_types`` but in other
+individual ``type_op`` fields. Most importantly, these are used
+on ``_cffi_globals`` entries:
 
 OP_CPYTHON_BLTN_*
     declare a function