diff --git a/elements/neuron/axon.md b/elements/neuron/axon.md
index 5118c6f..8efa7a7 100644
--- a/elements/neuron/axon.md
+++ b/elements/neuron/axon.md
@@ -17,6 +17,6 @@ AXON
 
   expansion:
 
-    _presynapse: TUB [ comp: PRESYNAPSE, full: 50x, active: 0x, empty: 10x ]
+    _presynapse: TUB [ comprehension: PRESYNAPSE, full: 50x, active: 0x, empty: 10x ]
     # managed_by: EXCITATION or INHIBITION from winnertakeall
 ```
diff --git a/elements/neuron/presynapse.md b/elements/neuron/presynapse.md
index b699680..722cec0 100644
--- a/elements/neuron/presynapse.md
+++ b/elements/neuron/presynapse.md
@@ -18,7 +18,7 @@ PRESYNAPSE
 
   expansion:
 
-    _Vgcc_pre: TUB_EXP [ comp: VGCC_PRE, full: 10x, active: 5x, empty: 2x ]
+    _Vgcc_pre: TUB_EXP [ comprehension: VGCC_PRE, full: 10x, active: 5x, empty: 2x ]
     # il tub serve al tuning
 
   intrication:
@@ -38,7 +38,7 @@ PRESYNAPSE
   instantiation:
 
     # Context
-    *TunePossible: CONTEXT []
+    *TunePossible: CONTEXT [ref: &...]
 
     # Tub
     _Ca2+: TUB [ full: 60x, active: 30x, empty: 0x ]
@@ -50,9 +50,9 @@ PRESYNAPSE
     # serve al dev
 
     # Behaviour
-    @: BEHAVIOUR [ beh: MAIN_PRE ]
-    @: BEHAVIOUR [ beh: TUNE_VGCC_PRE ]
-    @: BEHAVIOUR [ beh: DEV-TUBS_PRE ] # da eliminare neuron-dev.md
+    @: BEHAVIOUR [ behaviour: MAIN_PRE ]
+    @: BEHAVIOUR [ behaviour: TUNE_VGCC_PRE ]
+    @: BEHAVIOUR [ behaviour: DEV-TUBS_PRE ] # da eliminare neuron-dev.md
 ```
 
 ### MAIN_PRE
@@ -64,26 +64,26 @@ MAIN_PRE
 
   within_scope: !DAY
 
-  snippets:
+  snippet:
     # *AP
-    @: ACCUMULATOR [snip: NTreleaseLow, RF: active 12x]
-    @: ACCUMULATOR [snip: NTreleaseMedium, RF: active 9x]
-    @: ACCUMULATOR [snip: NTreleaseHigh, RF: active 6x]
+    @: ACCUMULATOR [snippet: NTreleaseLow, RF: active 12x]
+    @: ACCUMULATOR [snippet: NTreleaseMedium, RF: active 9x]
+    @: ACCUMULATOR [snippet: NTreleaseHigh, RF: active 6x]
 
-    @: ACCUMULATOR [snip: TracesAccLow, RF: active 3x]
-    @: ACCUMULATOR [snip: TracesAccMedium, RF: active 6x]
-    @: ACCUMULATOR [snip: TracesAccHigh, RF: active 10x]
+    @: ACCUMULATOR [snippet: TracesAccLow, RF: active 3x]
+    @: ACCUMULATOR [snippet: TracesAccMedium, RF: active 6x]
+    @: ACCUMULATOR [snippet: TracesAccHigh, RF: active 10x]
 
     # NOT *AP
-    @: ACCUMULATOR [snip: eCBClearenceMedium, RF: active 24x]
-    @: ACCUMULATOR [snip: eCBClearenceLow, RF: active 48x]
+    @: ACCUMULATOR [snippet: eCBClearenceMedium, RF: active 24x]
+    @: ACCUMULATOR [snippet: eCBClearenceLow, RF: active 48x]
 
-    @: ACCUMULATOR [snip: RPShuttleLow, RF: active 24x]
-    @: ACCUMULATOR [snip: RPShuttleMedium, RF: active 48x]
+    @: ACCUMULATOR [snippet: RPShuttleLow, RF: active 24x]
+    @: ACCUMULATOR [snippet: RPShuttleMedium, RF: active 48x]
 
-    @: ACCUMULATOR [snip: RefillGlutamine, RF: active 24x]
+    @: ACCUMULATOR [snippet: RefillGlutamine, RF: active 24x]
 
-    @: ACCUMULATOR [snip: TracesClearance, RF: active 30x]
+    @: ACCUMULATOR [snippet: TracesClearance, RF: active 30x]
 ```
 
 **Tubs:**
@@ -346,7 +346,7 @@ TUNE_VGCC_PRE
 
   tub_intricated:
 
-  snippets:
+  snippet:
 
     CheckVgccPreTun: CONTEXTOR [RF: active 60x]
     PossibleUpPreVgccTun: ACCUMULATOR [RF:active 10x]
diff --git a/modules/winnertakeall/winnertakeall.md b/modules/winnertakeall/winnertakeall.md
index b324852..c8feeee 100644
--- a/modules/winnertakeall/winnertakeall.md
+++ b/modules/winnertakeall/winnertakeall.md
@@ -20,7 +20,8 @@ WINNERTAKEALL
   include: 
     ../../elements/neuron.md
 
-  expansion: 
+  expansion:
+  
     @NEU_005: EXPAND [ comp: NEURON ]
     @NEU_006: EXPAND [ comp: NEURON ]
 
@@ -33,16 +34,16 @@ WINNERTAKEALL
 
     ## external
 
-    @IN-EXCI-001: BEHAVIOUR [ beh: IN_EXCITATION, __GroupPossible: GROUP [
+    @IN-EXCI-001: BEHAVIOUR [ behaviour: IN_EXCITATION, __GroupPossible: GROUP [
        post: @NEU_001.@AXO_001._presynapse, 
        post: @NEU_002.@AXO_001._presynapse ] ]
 
-    @OUT-EXCI-001: BEHAVIOUR [ beh: OUT_EXCITATION, __GroupPossible: GROUP [
+    @OUT-EXCI-001: BEHAVIOUR [ behaviour: OUT_EXCITATION, __GroupPossible: GROUP [
        post: @NEU_001.@D_BRANCH_002._postsynapse, 
        post: @NEU_002.@D_BRANCH_002._postsynapse, 
        astro: @NEU_001.@D_BRANCH_002._astrosynapse ] ]
 
-    @IN-INHI-001: BEHAVIOUR [ beh: IN_INHIBITION, __GroupPossible: GROUP [
+    @IN-INHI-001: BEHAVIOUR [ behaviour: IN_INHIBITION, __GroupPossible: GROUP [
        post: @NEU_001.@SOMA_001._somasynapse, 
        post: @NEU_002.@SOMA_001._somasynapse, 
        astro: @NEU_001.@SOMA_001._somasynapse ] ]
@@ -51,7 +52,7 @@ WINNERTAKEALL
 
     ### Area xxx
 
-    @: BEHAVIOUR [ beh: EXCITATION, __GroupPossible: GROUP [ 
+    @: BEHAVIOUR [ behaviour: EXCITATION, __GroupPossible: GROUP [ 
       pre: @NEU_001.@AXON-001._presynapse, 
       post: @NEU_001.@D_BRANCH_001._postsynapse, 
       astro: @NEU_001.@D_BRANCH_001._astrosynapse ] ]
@@ -66,17 +67,17 @@ EXCITATION
 
   activity_scope: !NIGHT
 
-  snippets:
+  snippet:
 
     # *Fixed
     @: CONTEXTOR [snip: Excitation_possible, RF: active 60x]
 
     # *ActivateAstroPostPre
-    @: BINDER [snip: Excitation_bind, RF: active 6x]
-    @: ACCUMULATOR [snip: ClearTraces, RF: active 6x]
+    @: BINDER [snippet: Excitation_bind, RF: active 6x]
+    @: ACCUMULATOR [snippet: ClearTraces, RF: active 6x]
 
     *DeActivateAstroPost
-    @: BINDER [snip: Excitation_unbind, RF: active 6x]
+    @: BINDER [snippet: Excitation_unbind, RF: active 6x]
 ```
 
 #### *Fixed
@@ -148,9 +149,4 @@ Excitation_unbind
     hypothesis: (BadTraces fullness) AND (NOT bind_condition[__GroupPossible.pre, __GroupPossible.post, __GroupPossible.astro] empty )
       unbind: [__GroupPossible.pre, __GroupPossible.post, __GroupPossible.astro]
       trace: None?
-
-    hypothesis: ( NOT _synapse empty )
-      action: 
-        @: UNBIND [ syn: _synapse ] 
-
 ```