diff --git a/setup.sh b/setup.sh
index 5a11b0cf..9bb75f05 100755
--- a/setup.sh
+++ b/setup.sh
@@ -26,14 +26,7 @@ mkdir -p ~/.zen/tmp
 
 ########################################################################
 # CREATE ~/astroport FILESYSTEM GATE
-mkdir -p ~/Astroport/${PLAYER}/film
-mkdir -p ~/Astroport/${PLAYER}/serie
-mkdir -p ~/Astroport/${PLAYER}/anime
-mkdir -p ~/Astroport/${PLAYER}/page
-mkdir -p ~/Astroport/${PLAYER}/web
-mkdir -p ~/Astroport/${PLAYER}/video
-echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/${PLAYER}/ajouter_video.modele.txt
-
+#~ echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/${PLAYER}/ajouter_video.modele.txt
 
 #######################################################################
 
diff --git a/tools/TW.cache.sh b/tools/TW.cache.sh
index 59d05c07..6d79e570 100755
--- a/tools/TW.cache.sh
+++ b/tools/TW.cache.sh
@@ -11,10 +11,8 @@ MOATS="$2"
 [[ ! ${ASTRONAUTENS} || ! $MOATS ]] && echo "${ME} : ASTRONAUTENS & MOATS needed" && exit 1
 
 start=$(date +%s)
-[[ ${IPFSNODEID} == "" ]]; then
+if [[ ${IPFSNODEID} == "" ]]; then
     IPFSNODEID=$(ipfs --timeout 12s id -f='<id>\n')
-else
-    echo "${ME} : IPFSNODEID MISSING" && exit 1
 fi
             ## GETTING LAST TW via IPFS
             echo "${ME} : IPFS : ipfs --timeout 120s cat  /ipns/${ASTRONAUTENS}"\
diff --git a/tools/ipfs_P2P_forward.sh b/tools/ipfs_P2P_forward.sh
index 150cf89a..736d82ab 100755
--- a/tools/ipfs_P2P_forward.sh
+++ b/tools/ipfs_P2P_forward.sh
@@ -10,7 +10,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 . "$MY_PATH/my.sh"
 ########################################################################
 YOU=$(myIpfsApi) || er+=" ipfs daemon not running"
-IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) || er+=" ipfs id problem"
+[[ $IPFSNODEID == "" ]] && IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) || er+=" ipfs id problem"
 [[ "$YOU" == "" || "$IPFSNODEID" == "" ]] && echo "ERROR : $er " && exit 1
 ########################################################################
 
@@ -23,6 +23,7 @@ then
         echo "# ADD fred@ONELOVE to ~/.ssh/authorized_keys" && mkdir -p ~/.ssh
         echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFLHW8P88C/B7622yXzdAn1ZcTBfE1A4wMqajBwAoHwUVTOUaYfvkiSxbzb5H9dPTAXhQU6ZfuLa70kTo1m2b9TKH0tD6hR3RiKJ0NIjCHYEypcPGpLmHaZWnBKPq3IUU24qFVdUJxnTkDdFUszYMNoV4nqlXY/ZYdNpic8L1jPPyfOLLfPFkuSxagyQj4FGJq77UQE5j+skMJS3ISkazNTLqOCGLFJ5qtBC11BvQaCJ4cQ2Ss7ejPYhpx16NLJfg9VtG4dv9ZebEIl2pf7niiQGSPrDMFWHuQcGAuHt/patr0BcvfvD3Gv+qNsVfAJCNZ2U5NHEMKIhgj1ilNPEw7 fred@ONELOVE" >> ~/.ssh/authorized_keys
     fi
+
     echo "Lanching  /x/ssh-$zuid"
     [[ ! $(ipfs p2p ls | grep "/x/ssh-$zuid") ]] && ipfs p2p listen /x/ssh-$zuid /ip4/127.0.0.1/tcp/22
     # echo "echo \"ssh-$zuid local port please?\"; read lport; ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$lport /p2p/$IPFSNODEID" >> ~/.zen/tmp/$IPFSNODEID/astroport/port
@@ -36,8 +37,14 @@ rm ~/.zen/tmp/$IPFSNODEID/x_ssh-$zuid.sh >/dev/null 2>&1
 if [[ ! -f ~/.zen/tmp/$IPFSNODEID/x_ssh-$zuid.sh ]]; then
     PORT=12345
     [ ${PORT} -eq 12345 ] && PORT=$((PORT+${RANDOM:0:3})) || PORT=$((PORT-${RANDOM:0:3}))
-    echo "[[ ! \$(ipfs p2p ls | grep x/ssh-$zuid) ]] && ipfs --timeout=5s ping -n 1 /p2p/$IPFSNODEID && ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$PORT /p2p/$IPFSNODEID && ssh $USER@127.0.0.1 -p $PORT" > ~/.zen/tmp/$IPFSNODEID/x_ssh-$zuid.sh
+    echo "if [[ ! \$(ipfs p2p ls | grep x/ssh-$zuid) ]]; then
+    ipfs --timeout=5s ping -n 1 /p2p/$IPFSNODEID
+    ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$PORT /p2p/$IPFSNODEID
+    ssh $USER@127.0.0.1 -p $PORT
+fi" > ~/.zen/tmp/$IPFSNODEID/x_ssh-$zuid.sh
 fi
+
+cat ~/.zen/tmp/$IPFSNODEID/x_ssh-$zuid.sh
 echo "https://ipfs.copylaradio.com/ipns/$IPFSNODEID/x_ssh-$zuid.sh"
 
 ## THIS PORT FORWARDING HUB COULD BE MADE MORE CONTROLABLE USING FRIENDSHIP LEVEL & IPFS BALISES
diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh
index 7c706b68..3357f7b6 100755
--- a/tools/new_file_in_astroport.sh
+++ b/tools/new_file_in_astroport.sh
@@ -85,7 +85,7 @@ PLAYER=$(cat ~/.zen/game/players/.current/.player 2>/dev/null);
 [[ $(ipfs key list -l | grep -w $G1PUB) ]] \
 && echo "(ᵔ◡◡ᵔ) INVITATION $G1PUB"  \
 && ASTRONS=$($MY_PATH/g1_to_ipfs.py "$G1PUB") \
-&& $MY_PATH/TW.cache.sh $ASTRONS $MOATS \
+&& $MY_PATH/TW.cache.sh ${ASTRONS} ${MOATS} \
 || echo "(╥☁╥ ) I cannot help you"
 
 ########################################################################
@@ -97,7 +97,7 @@ mkdir -p ~/.zen/game/players/$PLAYER/ipfs/.${IPFSNODEID}
 [[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'Astroport') ]] && er="Les fichiers sont à placer dans ~/Astroport/${PLAYER}/ MERCI" && echo "$er" && exit 1
 
 ### TyPE & type & T = related to ~/astroport location of the infile (mimetype subdivision)
-TyPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/Astroport/${PLAYER}/... TyPE(film, youtube, mp3, video, pdf)/ REFERENCE /
+TyPE=$(echo "$path" | cut -d '/' -f 6) # ex: /home/$YOU/Astroport/${PLAYER}/... TyPE(film, youtube, mp3, video, pdf)/ REFERENCE /
 type=$(echo "$TyPE" | awk '{ print tolower($0) }')
 PREFIX=$(echo "$TyPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M ou Y (all the alaphabet can address a data type
 
@@ -114,22 +114,22 @@ fi
 case ${type} in
     video)
         INDEXPREFIX="VIDEO_"
-        REFERENCE=$(echo "$path" | cut -d '/' -f 6 )
+        REFERENCE=$(echo "$path" | cut -d '/' -f 7 )
         TITLE="${file%.*}"
     ;;
     youtube)
         INDEXPREFIX="YOUTUBE_"
-        REFERENCE=$(echo "$path" | cut -d '/' -f 6 )
+        REFERENCE=$(echo "$path" | cut -d '/' -f 7 )
         TITLE="${file%.*}"
     ;;
     pdf)
         INDEXPREFIX="PDF_"
-        REFERENCE=$(echo "$path" | cut -d '/' -f 6 )
+        REFERENCE=$(echo "$path" | cut -d '/' -f 7 )
         TITLE="${file%.*}"
     ;;
     film | serie)
         INDEXPREFIX="TMDB_"
-        REFERENCE=$(echo "$path" | cut -d '/' -f 6 ) # Path contains TMDB id
+        REFERENCE=$(echo "$path" | cut -d '/' -f 7 ) # Path contains TMDB id
         if ! [[ "$REFERENCE" =~ ^[0-9]+$ ]] # ${REFERENCE} NOT A NUMBER
         then
             er="$er | ERROR: $path BAD TMDB code. Get it from https://www.themoviedb.org/ or use your a mobile phone number ;)"