diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5fbe134..540ab0f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,12 +7,12 @@ about: Create a bug report for the bootloader EEPROM or rpi-eeprom-update script
 This repository tracks bugs for the Raspberry Pi 4 bootloader EEPROM and Linux update scripts.
 
 * If you suspect a hardware problem then please read the [Boot Problems](https://www.raspberrypi.org/forums/viewtopic.php?p=437084) post first before contacting the reseller.
-* Support questions or should be posted on the Raspberry Pi [General Discussion](https://www.raspberrypi.org/forums/viewforum.php?f=63)**
+* Support questions or should be posted on the Raspberry Pi [General Discussion](https://www.raspberrypi.org/forums/viewforum.php?f=63) forum
 
 **Mandatory information**
 * Raspberry Pi model
-* Board revision (cat /proc/cpuinfo | grep Revision)
-* Operating system version .
+* Board revision (`cat /proc/cpuinfo | grep Revision`)
+* Operating system version
 * Details of any hardware attached e.g. links to USB 
 * Photo of the HDMI diagnostics screen, UART trace.
 
@@ -34,15 +34,15 @@ vcgencmd bootloader_config
 
 **SD card boot (please complete the following information):**  
  - SD card type
- - Partition information (sudo fdisk -l) if you are able to obtain this from another computer.
+ - Partition information (`sudo fdisk -l`) if you are able to obtain this from another computer
 
 **USB boot (please complete the following information):**  
-Verify that the the USB device works correctly when hot-plugged under Linux and attache the output of 'lsusb -vvv'
+Verify that the the USB device works correctly when hot-plugged under Linux and attach the output of 'lsusb -vvv'.
 
 **Network boot (please complete the following information):**  
-Network boot bug normally require one or more of the following log types. [PiServer](https://github.com/raspberrypi/piserver) is the officially supported network boot server.
+Network boot bug normally requires one or more of the following log types. [PiServer](https://github.com/raspberrypi/piserver) is the officially supported network boot server.
 
- - DHCP server configuration files e.g. dnsmasq.conf
+ - DHCP server configuration files e.g. `dnsmasq.conf`
  - Wireshark binary packet capture
  - UART logs with `uart_2ndstage=1` set in `config.txt`
 
diff --git a/firmware/beta/pieeprom-2022-01-20.bin b/firmware/beta/pieeprom-2022-01-20.bin
new file mode 100644
index 0000000..6266df1
Binary files /dev/null and b/firmware/beta/pieeprom-2022-01-20.bin differ
diff --git a/firmware/beta/recovery.bin b/firmware/beta/recovery.bin
index 755e406..a1d6290 100644
Binary files a/firmware/beta/recovery.bin and b/firmware/beta/recovery.bin differ
diff --git a/firmware/release-notes.md b/firmware/release-notes.md
index cd52ef9..548b0c8 100644
--- a/firmware/release-notes.md
+++ b/firmware/release-notes.md
@@ -3,6 +3,11 @@
 USB MSD boot also requires the firmware from Raspberry Pi OS 2020-08-20 or newer.
 https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-bootloader-configuration
 
+## 2022-01-20 - Some NVMe boot fixes - BETA
+   * PCIe retry on error
+   * NVMe logging changes
+   * NVMe attempts to boot twice
+
 ## 2021-12-02 - Promote the 2021-12-02 beta release to LATEST/STABLE
    * Just fixes a regression with MTB detection affecting factory testing