diff --git a/elements/neuron/presynapse.md b/elements/neuron/presynapse.md
index b4c2532..6fab7a0 100644
--- a/elements/neuron/presynapse.md
+++ b/elements/neuron/presynapse.md
@@ -18,39 +18,40 @@ include:
   pre_vgcc.md
 
 PRESYNAPSE
+
   type: comprehension
 
   expansion:
 
+    // il tub serve al tuning
     _@pre_vgcc: TUB [ comprehension: PRE_VGCC, full: 10x, active: 5x, empty: 2x ]
-    # il tub serve al tuning
 
   intrication:
 
-    # Scope
+    // Scope
     !DAY: INTRICATION [ ref: &ORGANISM.!DAY ]
     !NIGHT: INTRICATION [ ref: &ORGANISM.!NIGHT ]
 
-    # Context  
+    // Context  
     *AP: INTRICATION [ ref: &SOMA.*AP ]
     *TunePossible: INTRICATION [ ref: &NEURON.*TunePossible ] 
 
-    # Tub
+    // Tub
     _NT: INTRICATION [ ref: &ASTROSYNAPSE._NT ] 
     _ATP: INTRICATION [ ref: &ASTROCYTE._ATP ] 
     _eCB: INTRICATION [ ref: &POSTSYNAPSE._eCB ]
 
   instantiation:
 
-    # Context
-    *VcggPreActiveIncrease: CONTEXT []
-    *VcggPreActiveDecrease: CONTEXT []
+    // Context
+    *VcggIncrease: CONTEXT []
+    *VcggDecrease: CONTEXT []
     *Ca2PrePreActiveDecrease: CONTEXT []
     *Ca2PreActiveDecrease: CONTEXT []
     *RrpPreActiveDecrease: CONTEXT []
     *RrpPreActiveDecrease: CONTEXT []
 
-    # Tub
+    // Tub
     _Ca2: TUB [ full: 60x, active: 30x, empty: 0x ]
     _Rrp: TUB [ full: 30x, active: 15x, empty: 0x ]
     _Rp: TUB [ full: 30x, active: 15x, empty: 0x ]
@@ -62,13 +63,13 @@ PRESYNAPSE
     _RrpFullDev: TUB [ full: 100x, active: _Rrp.full, empty: 40x ]
     # serve al DEV
 
-    # Behaviour
+    // Behaviour
     $: BEHAVIOUR [ behaviour: MAIN_PRE ]
     $: BEHAVIOUR [ behaviour: TUNE_PRE_VGCC ]
     $: BEHAVIOUR [ behaviour: DEV_PRE_TUBS ]
 ```
 
-### MAIN_PRE: !DAY
+### !DAY | MAIN_PRE
 
 ```Gen
 MAIN_PRE
@@ -78,7 +79,7 @@ MAIN_PRE
   within_scope: !DAY
 
   snippet:
-    # *AP
+    // *AP
     @: ACCUMULATOR [ snippet: NTreleaseLow, rf: active 12x ]
     @: ACCUMULATOR [ snippet: NTreleaseMedium, rf: active 9x ]
     @: ACCUMULATOR [ snippet: NTreleaseHigh, rf: active 6x ]
@@ -87,7 +88,7 @@ MAIN_PRE
     @: ACCUMULATOR [ snippet: TracesAccMedium, rf: active 6x ]
     @: ACCUMULATOR [ snippet: TracesAccHigh, rf: active 10x ]
 
-    # NOT *AP
+    // NOT *AP
     @: ACCUMULATOR [ snippet: eCBClearenceMedium, rf: active 24x ]
     @: ACCUMULATOR [ snippet: eCBClearenceLow, rf: active 48x ]
 
@@ -130,8 +131,8 @@ In tutti i casi di NT
 
 ```Gen
 NTreleaseLow
-    type: accumulator
 
+    type: accumulator
     in_context: *AP
 
     hypothesis: _Ca2 mediumness AND _Rrp mediumness AND NOT _ATP empty 
@@ -143,8 +144,8 @@ NTreleaseLow
 
 ```Gen
 NTreleaseMedium
-    type: accumulator
 
+    type: accumulator
     in_context: *AP
 
     hypothesis: ( _Ca2 fullness AND _Rrp mediumness ) OR 
@@ -349,78 +350,78 @@ Ca2TracesClearance
       trace: None
 ```
 
-### TUNE_PRE_VGCC: !DAY
+### !DAY | TUNE_PRE_VGCC
 
 ```Gen
-
 TUNE_PRE_VGCC
-  type: behaviour
-  # qui stiamo attivando e disattivando PRE_VGCC. Fra un massimo full e minimo empty (empty puo' non essere 0)
 
+  // qui stiamo attivando e disattivando PRE_VGCC. Fra un massimo full e minimo empty (empty puo' non essere 0)
+
+  type: behaviour
   activity_scope: !DAY
 
   snippet:
 
-    # *TunePossible
-    @: CONTEXTOR [ snippet: VgccPreTunCheck, rf: active 60x ]
+    // *TunePossible
+    @: CONTEXTOR [ snippet: VgccCheck, rf: active 60x ]
 
-    # *VcggPreActiveIncrease
-    @: ACCUMULATOR [ snippet: VcggPreActiveIncrease, rf:active 10x ]
+    // *VcggIncrease
+    @: ACCUMULATOR [ snippet: VcggIncrease, rf:active 10x ]
 
-    # *VcggPreActiveDecrease
-    @: ACCUMULATOR [ snippet: VcggPreActiveDecrease, rf:active 10x ]
+    // *VcggDecrease
+    @: ACCUMULATOR [ snippet: VcggDecrease, rf:active 10x ]
 ```
 
 #### *TunePossible
 
-##### VgccPreTunCheck
+##### VgccCheck
 
 Qui controlliamo che ci siano le condizioni per aumentare o diminuire l'attivazione di VGCC
 
 ```Gen
-VgccPreTunCheck
+VgccCheck
+
     type contextor
-    
     in_context: *TunePossible
 
     condition:  _CaTraceHigh fullness
-      out_context: *VcggPreActiveIncrease
+      out_context: *VcggIncrease
 
     condition:  _CaTraceLow fullness
-      out_context: *VcggPreActiveDecrease
+      out_context: *VcggDecrease
 ```
 
-#### *VcggPreActiveIncrease
+#### *VcggIncrease
 
-##### VcggPreActiveIncrease
+##### VcggIncrease
 
 ```Gen
-VcggPreActiveIncrease
+VcggIncrease
     type: accumulator
 
-    in_context: *VcggPreActiveIncrease
+    in_context: *VcggIncrease
 
     hypothesis:  
       action: 
       trace: 
 ```
 
-#### *VcggPreActiveDecrease
+#### *VcggDecrease
 
-##### VcggPreActiveDecrease
+##### VcggDecrease
 
 ```Gen
-VcggPreActiveDecrease
+VcggDecrease
     type: accumulator
 
-    in_context: *VcggPreActiveDecrease
+    in_context: *VcggDecrease
 
     hypothesis:  
       action: 
       trace: 
 ```
 
-### DEV_PRE_TUBS: !NIGHT
+### !NIGHT | DEV_PRE_TUBS
 
 ```Gen