diff --git a/source/_docs/mqtt/logging.markdown b/source/_docs/mqtt/logging.markdown
index 87e937effea..ef77050610a 100644
--- a/source/_docs/mqtt/logging.markdown
+++ b/source/_docs/mqtt/logging.markdown
@@ -13,4 +13,3 @@ logger:
   logs:
     homeassistant.components.mqtt: debug
 ```
-
diff --git a/source/_docs/mqtt/service.markdown b/source/_docs/mqtt/service.markdown
index 130ff59e469..f80d37297c7 100644
--- a/source/_docs/mqtt/service.markdown
+++ b/source/_docs/mqtt/service.markdown
@@ -6,7 +6,7 @@ logo: mqtt.png
 
 The MQTT integration will register the service `mqtt.publish` which allows publishing messages to MQTT topics. There are two ways of specifying your payload. You can either use `payload` to hard-code a payload or use `payload_template` to specify a [template](/topics/templating/) that will be rendered to generate the payload.
 
-### Service `mqtt.publish`
+## Service `mqtt.publish`
 
 | Service data attribute | Optional | Description |
 | ---------------------- | -------- | ----------- |
@@ -26,10 +26,12 @@ payload: on
 ```
 
 {% raw %}
+
 ```yaml
 topic: home-assistant/light/1/state
 payload_template: "{{ states('device_tracker.paulus') }}"
 ```
+
 {% endraw %}
 
 `payload` must be a string. If you want to send JSON then you need to format/escape it properly. Like:
diff --git a/source/_integrations/analytics.markdown b/source/_integrations/analytics.markdown
index cddcd7ba759..34ca991779c 100644
--- a/source/_integrations/analytics.markdown
+++ b/source/_integrations/analytics.markdown
@@ -20,7 +20,7 @@ Home Assistant allows users to share their usage data via the analytics integrat
 
 The information sent depends on what options you opt-in to. You can opt-in during onboarding and by going to **{% my general title="Configuration >> General" %}** .
 
-**{% my general badge %}**
+{% my general badge %}
 
 When enabled, data will be sent 15 minutes after each start, and every 24h after startup. Sent data is printed to your log.
 
@@ -74,7 +74,7 @@ This includes:
 
 - The names of all your core integrations
 - The names and versions of all your custom integrations if you have any
-- Boolean to indicate that the [`energy` integration](/integrations/energy) is configured
+- Boolean to indicate that the [energy integration](/integrations/energy) is configured
 
 If your system includes the Supervisor, this will also contain:
 
diff --git a/source/_posts/2019-12-20-all-i-want-is-open-standards.markdown b/source/_posts/2019-12-20-all-i-want-is-open-standards.markdown
index b11eda9fa9a..a3e25bc5fe7 100644
--- a/source/_posts/2019-12-20-all-i-want-is-open-standards.markdown
+++ b/source/_posts/2019-12-20-all-i-want-is-open-standards.markdown
@@ -14,7 +14,7 @@ It's been a busy week with a lot of announcements around IoT standards, so I tho
 
 ## New IoT standard announced
 
-As it's been a while, the industry has announced yet a new effort to create a new IoT standard called [Project Connected Home over IP](https://www.connectedhomeip.com/). I think that there are a few interesting bits to this standard:
+As it's been a while, the industry has announced yet a new effort to create a new IoT standard called [Project Matter](https://buildwithmatter.com) (formally called: 'Connected Home over IP'). I think that there are a few interesting bits to this standard:
 
 The standard will be royalty-free. This is big, as it means that it will be easy for companies to build products. Take, for example, Homekit, which is a great IP-based local standard. Homekit has strict licensing and royalties, which prevented it from widespread adoption.
 
diff --git a/source/_posts/2021-09-01-release-20219.markdown b/source/_posts/2021-09-01-release-20219.markdown
index 0c81298a056..0cdd2496ff3 100644
--- a/source/_posts/2021-09-01-release-20219.markdown
+++ b/source/_posts/2021-09-01-release-20219.markdown
@@ -130,7 +130,7 @@ fulfilled in this release.
 For example, the [Kostal Plenticore Solar Inverter](/integrations/kostal_plenticore),
 [PVOutput](/integrations/pvoutput), [Fronius](/integrations/fronius),
 [SolaX Power](/integrations/solax), [Growatt](/integrations/growatt_server),
-[Solar-Log](/integrations/solar_log), [YouLess](/integrations/youless),
+[Solar-Log](/integrations/solarlog), [YouLess](/integrations/youless),
 [Emoncms](/integrations/emoncms), [Modbus](/integrations/modbus),
 and many more have added support for all the energy goodness.
 
diff --git a/source/_redirects b/source/_redirects
index 49ad01e8038..e5ebf1c7564 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -1078,6 +1078,7 @@
 /integrations/climate.modbus /integrations/modbus
 /integrations/cover.modbus /integrations/modbus
 /integrations/fan.xiaomi_miio /integrations/xiaomi_miio
+/integrations/google /integrations/calendar.google
 /integrations/light.xiaomi_miio /integrations/xiaomi_miio
 /integrations/lovelace /lovelace
 /integrations/remote.xiaomi_miio /integrations/xiaomi_miio
@@ -2057,6 +2058,7 @@
 /integrations/scene.knx /integrations/knx#scene
 /integrations/sensor.knx /integrations/knx#sensor
 /integrations/switch.knx /integrations/knx#switch
+/integrations/trace /docs/automation/troubleshooting
 /integrations/weather.knx /integrations/knx#weather
 /integrations/zigbee /integrations/xbee
 /integrations/hassio /hassio