diff --git a/degoogle.yml b/degoogle.yml
index d111ae0..fff7efd 100644
--- a/degoogle.yml
+++ b/degoogle.yml
@@ -110,9 +110,10 @@ web based products:
       eyes: null
       text: |
         Use good old-fashioned RSS feeds with Feeder (available from F-Droid)
-  #TODO: Groups
   groups:
     - title: Groups
+    - notes:
+      - Use other forum sites relating to specific topics. This is a very broad service.
   translate:
     - title: Translate
     - name: DeepL
@@ -374,6 +375,11 @@ web based products:
         French based cloud storage provider with free and paid plans. Can also be self-hosted. Open-Source. And it also offers a collaborative notes editor.
   hangouts:
     - title: Hangouts (text/video messaging)
+    - notes:
+      - |
+        See [this article](https://outline.com/BK8f7h) for why I didn't include WhatsApp and why you should NOT use it (if someone has a better Outline link, that would be much appreciated).
+      - |
+        I have also **removed** Telegram. See [Issue #29](https://github.com/tycrek/degoogle/issues/29) from @arsv.
     - name: Signal
       url: https://signal.org/
       eyes: 5
@@ -409,10 +415,10 @@ web based products:
       eyes: 5
       text: |
         Jitsi is an open-source secure video conferencing platform. No account is needed to use it, simply enter a Room Name to join or host a meeting. The host is able to kick rogue users from the call. Works directly in your browser, with apps available for iOS and Android. It is not necessary to self-host, but self-hosting is an option for those who wish to. Very low latency and easy to set up. A free public server is available at (https://meet.jit.si) (**5-eyes** server)
-# TODO: Whatsapp: - *Editor note: See [this article](https://outline.com/BK8f7h) for why I didn't include WhatsApp and why you should NOT use it (if someone has a better Outline link, that would be much appreciated).*
-# TODO: Telegram: I have also **removed** Telegram. See [Issue #29](https://github.com/tycrek/degoogle/issues/29) from @arsv.
   gmail:
     - title: Gmail
+    - notes:
+      - This is just for the Gmail service, not a client
     - name: Protonmail
       url: https://protonmail.com/
       eyes: null
@@ -517,6 +523,11 @@ web based products:
         Your Markdown notes stores in any Git Repo. Available for both Android (Play Store) and iOS.
   music tv movies:
     - title: Play Music, Movies, & TV
+    - notes:
+      - |
+        I can no longer recommend [Emby](https://emby.media/) as they are [no longer open-source](https://www.linuxuprising.com/2018/12/jellyfin-free-software-emby-media.html).
+      - |
+        Thanks to u/eA8KESARaW6iqCpHsbE4 for suggesting Jellyfin and pointing out that Emby isn't open-source.
     - name: Jellyfin
       url: https://jellyfin.github.io/
       eyes: null
@@ -547,8 +558,6 @@ web based products:
       eyes: null
       text: |
         Streaming music player that finds music from free sources automatically.
-#TODO: *Editor note: I can no longer recommend [Emby](https://emby.media/) as they are [no longer open-source](https://www.linuxuprising.com/2018/12/jellyfin-free-software-emby-media.html).*
-#TODO: Thanks to u/eA8KESARaW6iqCpHsbE4 for suggesting Jellyfin and pointing out that Emby isn't open-source.
   fonts:
     - title: Fonts
     - name: Open Font Library
@@ -606,13 +615,17 @@ web based products:
       url: https://transportr.app/
       eyes: null
       text: |
-        An open-source Transit app on Android that takes information from several providers (e.g Deutsche Bahn in Germany) and enables you to use them in the app. Visualises the routes on an online OpenStreetMap map. Works in most of Western-Europe, as well as the USA, Australia, Canada, New Zealand, Brazil, Nicaragua, Costa Rica, the UAE and Ghana.
-#TODO: **Beware: most information-providers only have beta or alpha support, it may be a good idea to keep a second app as a fallback option**
+        An open-source Transit app on Android that takes information from several providers (e.g Deutsche Bahn in Germany) and enables you to use them in the app. Visualises the routes on an online OpenStreetMap map. Works in most of Western-Europe, as well as the USA, Australia, Canada, New Zealand, Brazil, Nicaragua, Costa Rica, the UAE and Ghana. **Beware: most information-providers only have beta or alpha support, it may be a good idea to keep a second app as a fallback option**
   trends:
     - title: Trends
 operating systems:
   mobile:
     - title: Android/Fuchsia
+    - notes:
+      - |
+        You'll either need a rooted device with an unlocked bootloader, or a specific device depending on which OS you like.
+      - |
+        Please see Issue #55 for details on /e/.
     - name: Ubuntu Touch
       url: https://ubuntu-touch.io/
       eyes: null
@@ -643,7 +656,6 @@ operating systems:
       eyes: 5
       text: |
         Free Android distribution. Puts the emphasis on "freedom and privacy/security".
-# TODO: Note: Please see Issue #55 for details on /e/.
   chromeos:
     - title: Chrome OS
     - name: Qubes OS
@@ -757,6 +769,9 @@ desktop applications:
 mobile applications:
   play store:
     - title: Play Store
+    - notes:
+      - |
+        When searching for replacements, check the alternative stores (such as F-Droid) before checking the Play Store.
     - name: F-Droid
       url: https://f-droid.org/
       eyes: null
@@ -1047,7 +1062,9 @@ mobile applications:
         You need to have Piwigo set up first.
   pay:
     - title: Pay
-#TODO: Note: Realistically, there most likely is not a privacy friendly alternative to Google Pay. Get a wallet with RFID protection and keep your cards with you.
+    - notes:
+      - |
+        Realistically, there most likely is not a privacy friendly alternative to Google Pay. Get a wallet with RFID protection and keep your cards with you.
   youtube:
     - title: YouTube
     - name: NewPipe
@@ -1220,7 +1237,6 @@ hardware:
         Open-source home automation. (thanks u/bilange)
   fitbit:
     - title: FitBit
-    - name: FitBit acquisition
-      url: https://outline.com/tsJCYN
-      text: |
-        *Due to Google's  [recent acquisition of FitBit](https://outline.com/tsJCYN), it is recommended to avoid using FitBit. Instead, check out this [list of smart watches](https://asteroidos.org/install/) supported by Asteroid OS (See Wear OS in [Operating systems](#operating-systems)). Thanks @ribtoks*
\ No newline at end of file
+    - notes:
+      - |
+        Due to Google's  [recent acquisition of FitBit](https://outline.com/tsJCYN), it is recommended to avoid using FitBit. Instead, check out this [list of smart watches](https://asteroidos.org/install/) supported by Asteroid OS (See Wear OS in [Operating systems](#operating-systems)). Thanks @ribtoks
\ No newline at end of file