diff --git a/boards/beaglebone/ai-64/04-expansion.rst b/boards/beaglebone/ai-64/04-expansion.rst
index cfff04f233fb6c74ce7d04ec90d8b6286943b3c8..dac7baaab128d0a922165d03e149f057bf0098ee 100644
--- a/boards/beaglebone/ai-64/04-expansion.rst
+++ b/boards/beaglebone/ai-64/04-expansion.rst
@@ -65,7 +65,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to directly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
@@ -793,7 +793,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to directly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
@@ -2179,7 +2179,7 @@ RANDOM PRU STUFF THAT MIGHT NEED A HOME
 BeagleBone AI-64 and on which connector and pins they are accessible
 from. Some signals are accessible on the same pins.
 
-.. _table-11,Table 11:
+.. _table-11:
 
 .. list-table:: PRU0 and PRU1 Access
    :header-rows: 1
diff --git a/boards/beaglev/ahead/04-expansion.rst b/boards/beaglev/ahead/04-expansion.rst
index 4f0159f9c11cc702a3ce43b8460e1839b446bc97..009f0ab064a8717bc4957f9e773c375a7c20ea82 100644
--- a/boards/beaglev/ahead/04-expansion.rst
+++ b/boards/beaglev/ahead/04-expansion.rst
@@ -38,7 +38,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to directly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
@@ -485,7 +485,7 @@ Each row includes the gpiochipX and pinY in the format of
 `X Y`. You can use these values to direcly control the GPIO pins with the 
 commands shown below.
 
-.. code::
+.. code:: bash
 
     # to set the GPIO pin state to HIGH
     debian@BeagleBone:~$ gpioset X Y=1
diff --git a/boards/beaglev/fire/05-demos.rst b/boards/beaglev/fire/05-demos.rst
index 56b95dc0c02c5dc147c305615bbcc5b84d0c2315..c318c38ca1cfd58905562383f2583d855daf2092 100644
--- a/boards/beaglev/fire/05-demos.rst
+++ b/boards/beaglev/fire/05-demos.rst
@@ -19,3 +19,4 @@ Demos
     demos-and-tutorials/gateware/index
     demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board
     demos-and-tutorials/gateware/gateware-full-flow
+    demos-and-tutorials/gateware/gateware-tcl-scripts-structure
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
index e00bea74049d8922da4241d1bb15568a6159fa66..7dd296786dadd406bd6b8f24c55ab3baefb52442 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-full-flow.rst
@@ -1,3 +1,5 @@
+.. _beaglev-fire-gateware-full-build-flow:
+
 Gateware Full Build Flow
 ########################
 
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
index 31c9bc75051bbe6fe076d34008125ac9565a9115..c38cb1543b844f22cd55b090d26aa4a77156dcd3 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/gateware-tcl-scripts-structure.rst
@@ -1,3 +1,5 @@
+.. _beaglev-fire-gateware-tcl-scripts-structure:
+
 Gateware TCL Scripts Structure
 ##############################
 
diff --git a/boards/capes/cape-interface-spec.rst b/boards/capes/cape-interface-spec.rst
index 2943bb157eccae6e9e4f2964351886fa3c769223..beb41b18707d31cdedc1bca21ea9a0e2f33b36a7 100644
--- a/boards/capes/cape-interface-spec.rst
+++ b/boards/capes/cape-interface-spec.rst
@@ -490,7 +490,7 @@ Cape interface specification provides |I2C| controller device links for userspac
 |I2C| overlay example
 =====================
 
-.. code-block::
+.. code-block:: devicetree
    :linenos:
    :caption: Example device tree overlay to enable I2C driver
    :name: bone_cape_spec_i2c_example
diff --git a/books/beaglebone-cookbook/02sensors/sensors.rst b/books/beaglebone-cookbook/02sensors/sensors.rst
index ef9f0b667f759ae76a69e71e0b080cb9c84d80b7..521f9bd147ed4e8c34eafda14df666993d9a05f9 100644
--- a/books/beaglebone-cookbook/02sensors/sensors.rst
+++ b/books/beaglebone-cookbook/02sensors/sensors.rst
@@ -124,7 +124,7 @@ By default, it takes you to your home directory. Notice that the prompt has chan
 - Press ^S (Ctrl-S) to save the file. (You can also go to the File menu in VSC and select Save to save the file, but Ctrl-S is easier.) Even easier, VSC can be configured to autosave every so many seconds.
 - In the *bash* tab, enter the following commands:
 
-.. code-block::
+.. code-block:: bash
 
   debian@beaglebone:beaglebone-cookbook/code/02sensors$ ./pushbutton.py
   data= 0
diff --git a/books/beaglebone-cookbook/04motors/motors.rst b/books/beaglebone-cookbook/04motors/motors.rst
index 0879e86ca56d259fcca805012fc64bb9397f54fa..d28b0465c69566ceac13ec0e62edcacefb51ca27 100644
--- a/books/beaglebone-cookbook/04motors/motors.rst
+++ b/books/beaglebone-cookbook/04motors/motors.rst
@@ -143,6 +143,7 @@ Combine the code from :ref:`digital_rotaryEncoder_js` and :ref:`motors_servo`.
 .. _py_servoEncoder_code:
 
 .. literalinclude:: ../code/04motors/servoEncoder.py
+   :language: python
    :caption: Code for driving a servo motor with a rotary encorder(servoEncoder.py)
    :linenos: