diff --git a/README.md b/README.md
index d4309fb8..b3602f28 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,17 @@
 # Pwnagotchi-Torch
 <a href="https://github.com/jayofelony/pwnagotchi/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/jayofelony/pwnagotchi.svg"></a><br/>
-**This fork of [Pwnagotchi](https://www.pwnagotchi.ai) has been overhauled to work solely on 64-bit Raspberry Pi's, it uses PyTorch as its AI.**
+**This fork of [Pwnagotchi](https://www.pwnagotchi.ai) now works on **ALL** Raspberry Pi's that have built-in Wi-Fi.**
 
 **Use RPi imager to flash, if you want you can set a custom user/pass to ssh in.**
 
-Default SSH credentials are pi/raspberry
+Default SSH credentials are pi/raspberry and for Orange Pi pi/orange
 
-# FAQ:
-- Is the Raspberry Pi Zero W 2 working perfectly with this image?
-
-  No, sadly not. It will reboot and restart Wi-Fi as often as needed by fix_services plugin. So don't freak out by that. I hope it will be sorted in the future.
-- Will it go blind often?
-
-  Yes! But I have tried to make it automatically fix **most** errors that may occur.
-- Can you help me install an external antenna?
-
-  Nope I will not help with these 'issues'. Read the manual/readme for your specific device, if that doesn't help -> **[GOOGLE](https://www.google.com)**
-
-- If you want to use the gdrivesync plugin >> [README](README-google.md)
-# Patreon: 
+# Donations: 
 
 [Pwnagotchi-Torch](https://www.patreon.com/pwnagotchi_torch)
 
+[GH Sponsor](https://github.com/sponsors/jayofelony)
+
 ---
 
 [Pwnagotchi](https://pwnagotchi.ai/) is an [A2C](https://hackernoon.com/intuitive-rl-intro-to-advantage-actor-critic-a2c-4ff545978752)-based "AI" leveraging [bettercap](https://www.bettercap.org/) that learns from its surrounding Wi-Fi environment to maximize the crackable WPA key material it captures (either passively, or by performing authentication and association attacks). This material is collected as PCAP files containing any form of handshake supported by [hashcat](https://hashcat.net/hashcat/), including [PMKIDs](https://www.evilsocket.net/2019/02/13/Pwning-WiFi-networks-with-bettercap-and-the-PMKID-client-less-attack/), 
diff --git a/bin/pwnagotchi b/bin/pwnagotchi
index 5f0c88f9..5f737306 100755
--- a/bin/pwnagotchi
+++ b/bin/pwnagotchi
@@ -99,7 +99,7 @@ def do_auto_mode(agent):
 if __name__ == '__main__':
     def add_parsers(parser):
         """
-        Adds the plugins and google subcommands to a given argparse.ArgumentParser
+        Adds the plugins and google subcommands
         """
         subparsers = parser.add_subparsers()
 
diff --git a/builder/data/etc/bash_completion.d/pwnagotchi_completion.sh b/builder/data/etc/bash_completion.d/pwnagotchi_completion.sh
index 767fa861..8424a534 100644
--- a/builder/data/etc/bash_completion.d/pwnagotchi_completion.sh
+++ b/builder/data/etc/bash_completion.d/pwnagotchi_completion.sh
@@ -2,7 +2,7 @@ _show_complete()
 {
     local cur opts node_names all_options opt_line
     all_options="
-pwnagotchi -h --help -C --config -U --user-config --manual --skip-session --clear --debug --version --print-config --check-update --donate {plugins}
+pwnagotchi -h --help -C --config -U --user-config --manual --skip-session --clear --debug --version --print-config --check-update --donate {plugins,google}
 pwnagotchi plugins -h --help {list,install,enable,disable,uninstall,update,upgrade}
 pwnagotchi plugins list -i --installed -h --help
 pwnagotchi plugins install -h --help
diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index eeeb8379..46ca0055 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -284,13 +284,13 @@
           export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin
       when: golang.changed
 
-    - name: download pwngrid 1.10.4
+    - name: download pwngrid
       git:
         repo: "{{ packages.opwngrid.source }}"
         dest: /usr/local/src/opwngrid
       register: pwngrid
 
-    - name: install pwngrid 1.10.4
+    - name: install pwngrid
       shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go mod tidy && make && make install"
       args:
         executable: /bin/bash
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index 1d7cff94..b26acb13 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -398,7 +398,7 @@
           export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin
       when: golang.changed
 
-    - name: download opwngrid 1.10.4
+    - name: download opwngrid
       unarchive:
         remote_src: yes
         src: "{{ packages.opwngrid.url }}"
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 45afdf20..d496e0ac 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -370,12 +370,12 @@
           export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin
       when: golang.changed
 
-    - name: download opwngrid 1.10.4
+    - name: download opwngrid
       git:
         repo: "{{ packages.opwngrid.source }}"
         dest: /usr/local/src/opwngrid
 
-    - name: install opwngrid 1.10.4
+    - name: install opwngrid
       shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && go mod tidy && make && make install"
       args:
         executable: /bin/bash