diff --git a/content/1.self-hosting/4.troubleshooting.md b/content/1.self-hosting/4.troubleshooting.md
index 22608af..7c330b1 100644
--- a/content/1.self-hosting/4.troubleshooting.md
+++ b/content/1.self-hosting/4.troubleshooting.md
@@ -3,6 +3,40 @@ title: 'Troubleshooting'
 ---
 # Troubleshooting
 
-// EXPLAIN HOW TO TROUBLESHOOT
+There is a possibility for something to go wrong while trying to deploy your own instance of movie-web. This page will contain common issues people come across while self-hosting and their solutions.
 
-// MENTION ADMIN PAGE FOR TROUBLESHOOTING
+
+## "Failed to find media, try again!" while searching
+
+This is likely a misconfigured TMDB api key. Verify that TMDB isn't working by going to `/admin` or `/#/admin`. Then clicking `Test TMDB`.
+
+If it succeeds, the TMDB api key is correct and it will be a different issue.
+
+If it does not work. Recheck your TMDB api key. **Make sure its the READ api key, not the normal api key.**
+
+
+## Everything I try to watch fails
+
+This is likely a misconfigured worker. Verify that the workers are the issue by going to `/admin` or `/#/admin`. Then clicking `Test workers`.
+
+You should have at least 1 worker registered.
+
+If any worker fails the test, you should double check its URL and double check if the worker has the correct code.
+
+
+## I can't make an account or login
+
+This is likely misconfigured or broken backend. Verify the backend by going to `/admin` or `/#/admin`. Then clicking `Test backend`.
+
+It should give you the name that you have configured as backend with the latest version of the backend.
+
+If the test gives you an error, your backend URL configuration option likely has a typo.
+
+If the version is not the latest version, you should update your backend instance.
+
+If the name and description of the results don't match your own instance, make sure you have your backend URL set correctly.
+
+
+## I updated from version 3 to version 4 but still see the old version
+
+This is likely that you haven't installed the PWA version of movie-web. Please read the [upgrade guide](../3.client/5.upgrade.md)
diff --git a/content/3.client/5.upgrade.md b/content/3.client/5.upgrade.md
index 33cc0c6..2ff7431 100644
--- a/content/3.client/5.upgrade.md
+++ b/content/3.client/5.upgrade.md
@@ -3,7 +3,7 @@ title: 'Upgrade guide'
 ---
 # Upgrade guide
 
-## From `3.X` to `4.0.0`
+## From `3.X` to `4.X`
 
 You will need the latest version of the proxy worker. Redeploy a new worker using [our self-hosting guide](../2.proxy/1.deploy.md).