diff --git a/SSH-VPN-VNC/Questions.md b/SSH-VPN-VNC/Questions.md
index 5796c330a027819f448dac9431f7efa7067d819e..15e137ac4d8f2eba676a23621d6fcd742f5c7e36 100644
--- a/SSH-VPN-VNC/Questions.md
+++ b/SSH-VPN-VNC/Questions.md
@@ -4,7 +4,7 @@ Please feel free to add you questions and anwsers.
 [[_TOC_]]
 
 
-## Q: ssh using key authentication?
+## Q: How to use ssh-key authentication?
  
 In order to connect passwordless to a remote server a key needs to be generated.
 ```
@@ -29,11 +29,34 @@ The key's randomart image is:
 |                 |
 +----[SHA256]-----+
 ```
-It is recommended to use a password to encrpyt the private key `.ssh/id_rsa`. However, this password is then required to login. 
 
-Todo add infos on `ssh-agent`
+It is recommended to use a password to encrpyt the private key `.ssh/id_rsa`. However, this password is then required each time to login. Using an  `ssh-agent` can solve that problem.
 
-# Q: How to transfer files between two VPN networks?
+## Q: How to use an ssh-agent?
+Using an SSH-Agent will make your connection even safer, as your private key is encrypted with a passphrase. To create a ssh-key goto [How to use ssh-key authentication?](#How-to-use-ssh-key-authentication?).
+
+Continue with how to use the ssh-agent:
+```bash
+# Launch the SSH Agent
+eval `ssh-agent`
+# this will add your ssh-keys from ~/.ssh/
+# You will be asked a passphrase if you have one
+# this will add .ssh/id_rsa as default
+ssh-add 
+# or any keyfile you created:
+ssh-add .ssh/secret_key
+# Copy the ssh-key (pub) to the server 
+ssh-copy-id [user]@[server]
+# and connect
+ssh [user]@[server]
+# Kill the agent and all store secure information
+ssh-agent -k
+```
+**Tip: configure your `.ssh/config` file to use the correct key a server. Goto [SSH](SSH.md)**
+
+[Nice summary of how an ssh-agent works](https://smallstep.com/blog/ssh-agent-explained/)
+
+## Q: How to transfer files between two VPN networks?
 
 You should be able to use an SSH tunnel via a gateway server
 
diff --git a/SSH-VPN-VNC/README.md b/SSH-VPN-VNC/README.md
index 699ba6f1423d82f565307d1503f00eb9e5ec82dc..e6a9cc5907c1680c30c296ffac507b26ef515134 100644
--- a/SSH-VPN-VNC/README.md
+++ b/SSH-VPN-VNC/README.md
@@ -4,17 +4,19 @@
 
 ## General Access
 Please use these methods to access the servers:
-1. [SSH](SSH.md)
-2. [JupyterHub](../TeachingHub.md)
-3. [VNC](VNC.md)
-4. [VPN](VPN.md)
+1. Connect using [SSH](SSH.md)
+2. Connect using [TeachingHub](../TeachingHub.md) or [ResearchHub](../Jet-Cluster.md#jupyterhub)
+3. Connect using [VNC](VNC.md)
+4. Access from outside the UNI, [VPN](VPN.md)
 
 ## Jupyterhub
+Currently, there are two JupyterHub instances runnning:
+- TeachingHub on SRVX1
+- ResearchHub on Jet01 
 
-On SRVX1 the TeachingHub and on Jet01 the ResearchHub is running and available to users and students. Connect to either [https://srvx1.img.univie.ac.at](https://srvx1.img.univie.ac.at) from everywhere or [https://jet01.img.univie.ac.at](https://jet01.img.univie.ac.at) from within the university network.
-
-[Here](../TeachingHub.md) is more information on how to connect and authenticate.
-
+Connect to either 
+- [https://srvx1.img.univie.ac.at](https://srvx1.img.univie.ac.at) from everywhere 
+- [https://jet01.img.univie.ac.at](https://jet01.img.univie.ac.at) from within the university network.
 
 ## Screen
 [Screen](https://wiki.ubuntuusers.de/Screen/) is terminal session manager, that allows to start processes and reconnect to these processes after disconnection.
@@ -28,4 +30,10 @@ You can detach from this session with `CTRL + A + D` and reconnect again with `s
 
 Multiple Sessions can be created and the output saved (`-L` Option).
 
+## Questions and Answers
+- [Q: How to use ssh-key authentication?](Questions.md#q-how-to-use-ssh-key-authentication)
+- [Q: How to use an ssh-agent?](Questions.md#q-how-to-use-an-ssh-agent)
+- [Q: How to transfer files between two VPN networks?](Questions.md#q-how-to-transfer-files-between-two-vpn-networks)
+- [Q: How to connect to Jet, SRVX8, SRVX2?](Questions.md#q-how-to-connect-to-jet-srvx8-srvx2)
+- [Q: How to mount a remote file system on Linux (MAC)?](Questions.md#q-how-to-mount-a-remote-file-system-on-Linux-mac)