diff --git a/agora ext.md b/agora ext.md
index 47994605a..1d6f76ac3 100644
--- a/agora ext.md	
+++ b/agora ext.md	
@@ -1,8 +1,13 @@
 # Agora Ext
 
 - a [[browser extension]] 
-  - by [[vera]].
+  - it makes [[wikilinks]] clickable on your browser on arbitrary websites.
+  - [[firefox]] https://addons.mozilla.org/en-US/firefox/addon/agora/
+  - [[chrome]] pending
+  - by [[vera]] and [[flancia collective]].
   - [[git]] https://gitlab.com/veracantcode/agora-ext
     - [[go]] [[git]] 
-  - [[firefox]] https://addons.mozilla.org/en-US/firefox/addon/agora/
+    - I think this needs updating to point to the [[flancia coop]] repository?
+  - [[pull]] [[patterns everywhere]]
+    - likely new name
 
diff --git a/assets/ocell.jpg b/assets/ocell2.jpg
similarity index 100%
rename from assets/ocell.jpg
rename to assets/ocell2.jpg
diff --git a/buddha.md b/buddha.md
index 4d79c2413..9935dcd78 100644
--- a/buddha.md
+++ b/buddha.md
@@ -1,11 +1,13 @@
 # Buddha
 
 - A [[person]].
-  - [[philosopher]] [[role model]].
-  - [[pull]] [[buddha nature]].
+  - [[philosopher]] [[bodhisattva]] [[arahant]]
+  - [[pull]] [[buddha nature]] 
+  - [[shakyamuni]]
+    - I'm not sure about my thoughts on many earlier and later [[buddhas]], but I do believe there are many apart from [[siddharta gautama]].
   - I consider myself a [[rational]] [[buddhist]].
-  - [[meta]] 
-    - Ha, I can't believe I hadn't noded him until [[2020-12-11]].
-    - As of [[2021-11-20]] this was still clearly a stub.
+    - [[meta]] 
+      - Ha, I can't believe I hadn't noded him until [[2020-12-11]].
+      - As of [[2021-11-20]] this was still clearly a stub.
 
 
diff --git a/cat tournament.md b/cat tournament.md
new file mode 100644
index 000000000..4eeeb5c22
--- /dev/null
+++ b/cat tournament.md	
@@ -0,0 +1,15 @@
+# cat tournament
+
+- a [[tournament]].
+  - [[pull]] [[cats]]
+  - organized by [[mechanical monk]]
+  - [[go]] https://twitter.com/mechanical_monk/status/1461765427214929927
+    - [[goblin odds]] https://twitter.com/goblinodds/status/1462120594049093638
+    - [[push]] [[round one]]
+      - [[flancian]] 
+        - [[ocell]] == [[lady burup]]
+        - https://twitter.com/flancian/status/1462130400332025861
+        - https://twitter.com/flancian/status/1462137083863212033
+    - [[round two]] https://twitter.com/mechanical_monk/status/1462151807954784263
+
+
diff --git a/goblin odds.md b/goblin odds.md
new file mode 100644
index 000000000..644c4969e
--- /dev/null
+++ b/goblin odds.md	
@@ -0,0 +1,6 @@
+# goblin odds
+
+- a [[person]]
+  - [[friend]]
+  - [[pull]] [[goblinodds]]
+
diff --git a/hacking in progress.md b/hacking in progress.md
new file mode 100644
index 000000000..a675a4d5b
--- /dev/null
+++ b/hacking in progress.md	
@@ -0,0 +1,4 @@
+# hacking in progress
+
+- [[twitter]] https://twitter.com/flancian/status/1462026543891423239
+
diff --git a/indian food.md b/indian food.md
new file mode 100644
index 000000000..adf1468b4
--- /dev/null
+++ b/indian food.md	
@@ -0,0 +1,8 @@
+# indian food
+
+- a [[tradition]].
+  - One of my [[favourites]].
+  - [[paneer]] [[mattar]] [[saag]] [[butter]] 
+  - [[dal makhani]]
+  - [[saag aloo]]
+
diff --git a/journal/2021-11-20.md b/journal/2021-11-20.md
index f341da93c..27f412948 100644
--- a/journal/2021-11-20.md
+++ b/journal/2021-11-20.md
@@ -1,17 +1,7 @@
 # 2021-11-20
 
-- [[agora bot]]
-  - [ ] write links to disk, per [[wikilink]]
-  - [ ] write files to git repo api
-  - [ ] ...
-  - [ ] reply to https://twitter.com/ScriptAutomate/status/1461890552149032966
 - [[daryl davis]]
   - [[minds.com]]
-- [[push]] [[agora plan]]
-  - I should finally implement [[auto push]] and [[auto pull]] inferred from list structure
-  - [ ] parse all subnodes through lxml?
-  - [ ] derive heterarchy of [[wikilinks]]
-  - [ ] try auto pushing and pulling through all heterarchies
 - [[write]]
   - [[meditation practice]]
     - [ ] post in https://twitter.com/flancian/status/1460668561974771718
@@ -36,8 +26,37 @@
 - is [[metarraine]] a bot? weird [[patterns]]: many followers that look autogenerated
 - [[nietszche]]
 - [[melog]]
-- [ ] [[fix twitter embeds]]
+- [x] [[fix twitter embeds]]
   - this slipped my mind somehow :) twitter embeds are broken. I think because of a fix to an org mode bug/interaction with my hacky hacky code.
   - shouldn't take long to fix.
+  - https://github.com/flancian/agora-server/issues/26 was involved
+  - 6c7021dcac6c8bc2646662c59462b01eaef30ea0 fixes (I think)
 - [[buddha]]
+  - [[shakyamuni]]
 - [[sadalsvvd]]
+- [[mechanical monk]]
+  - [[cat tournament]]
+    - [[ocell]] == [[lady burup]]
+- [[hacking in progress]]
+- [[push]] [[paneer]]
+  - I think we'll have [[indian food]] for dinner.
+- [[social knowledge graphs]]
+- [[push]] [[do]]
+  - implement [[pipe alias|pipe aliases]]
+- [[logseq]] told me about [[roam garden]]
+- [[push]] [[2021-11-21]]
+  - [[agora bot]]
+    - [ ] write links to disk, per [[wikilink]]
+    - [ ] write files to git repo api
+    - [ ] ...
+    - [ ] reply to https://twitter.com/ScriptAutomate/status/1461890552149032966
+  - [[push]] [[agora plan]]
+    - I should finally implement [[auto push]] and [[auto pull]] inferred from list structure
+    - [ ] parse all subnodes through lxml?
+    - [ ] derive heterarchy of [[wikilinks]]
+    - [ ] try auto pushing and pulling through all heterarchies
+  - [[write]]
+    - [[meditation practice]]
+      - [ ] post in https://twitter.com/flancian/status/1460668561974771718
+    - [[building bridges]]
+
diff --git a/journal/2021-11-21.md b/journal/2021-11-21.md
index f6f667576..7b083cdbd 100644
--- a/journal/2021-11-21.md
+++ b/journal/2021-11-21.md
@@ -1,3 +1,23 @@
 # 2021-11-21
 
-- [[meitei]]
\ No newline at end of file
+<<<<<<< HEAD
+- [[meitei]]
+=======
+- [[revolution]]
+- [[do]]
+  - [[agora bot]]
+    - [ ] write links to disk, per [[wikilink]]
+    - [ ] write files to git repo api
+    - [ ] ...
+    - [ ] reply to https://twitter.com/ScriptAutomate/status/1461890552149032966
+  - [[push]] [[agora plan]]
+    - I should finally implement [[auto push]] and [[auto pull]] inferred from list structure
+    - [ ] parse all subnodes through lxml?
+    - [ ] derive heterarchy of [[wikilinks]]
+    - [ ] try auto pushing and pulling through all heterarchies
+  - [[write]]
+    - [[meditation practice]]
+      - [ ] post in https://twitter.com/flancian/status/1460668561974771718
+    - [[building bridges]]
+
+>>>>>>> 4f37fb6ecac546a3e031e26e1d9e87c4c16ae8e0
diff --git a/lady burup.md b/lady burup.md
index 63ee43a05..284ccf635 100644
--- a/lady burup.md	
+++ b/lady burup.md	
@@ -1,6 +1,6 @@
 
 - a [[cat]].
-  - [[friend]].
-    - I [[love]] [[them]].
-  - [[pull]] [[ocell]]
+  - [[friend]]
+  - [[pseudonym]] 
+    - [[pull]] [[ocell]]
 
diff --git a/mechanical monk.md b/mechanical monk.md
index decf18aa2..3a1707efb 100644
--- a/mechanical monk.md	
+++ b/mechanical monk.md	
@@ -1,6 +1,8 @@
-# Mechanical Monk
-- A [[person]] on [[twitter]]: https://twitter.com/mechanicalmonk1
-- https://twitter.com/mechanicalmonk1/status/1276068476868792320
-- [[Reasonable Movement]]
-- [[Carrot Cake]]
+
+- A [[person]] 
+  - [[twitter]]: https://twitter.com/mechanicalmonk1
+  - https://twitter.com/mechanicalmonk1/status/1276068476868792320
+  - [[reasonable movement]]
+  - [[carrot cake]]
+  - [[pull]] [[cat tournament]]
 
diff --git a/ocell.md b/ocell.md
index 178ae023a..ece605c78 100644
--- a/ocell.md
+++ b/ocell.md
@@ -1,16 +1,17 @@
 # Ocell
 
-- a [[cat]]
+- a [[cat]].
 	- [[friend]]
-	- I [[love]] them.
-	- She lives with us: https://twitter.com/flancian/status/1325024046346539008/photo/1
-		- A Spanish shelter cat. We adopted her when she was a bit over a year old.
+		- I [[love]] them.
+ 	- [[twitter]] https://flancia.org/t/ocell
+	- She lives with us: 
+		- [[flancian]] https://twitter.com/flancian/status/1325024046346539008
+		- Previously in a shelter in [[granada]]. We adopted her when she was a bit over a year old.
 		- We picked her up in Brugg on [[2020-11-07]].
 		- Technically her name is masculine (it means "bird" in Catalan) but I don't think she cares about grammatical gender.
-	- [[pull]] [[lady burup]].
-		- a.k.a.
+		- [[pull]] [[lady burup]] is her pseudonymous.
+ 	- [[objetos mentales]] https://twitter.com/objetosmentales/status/1383803765275303949
 	- [[slides]] https://docs.google.com/presentation/d/1RUXIvwPQyy1_7ujltbT7NEFYTePtl6zhSuXUBJb4oy0/edit#slide=id.p
+  - <img src="https://anagora.org/raw/garden/flancian/assets/ocell2.jpg" width=100%>
+ 	- <img src="https://i.imgur.com/szKP7jB.jpg" width=100%>
 
-<img src="https://i.imgur.com/szKP7jB.jpg" width=50%>
-
-https://twitter.com/objetosmentales/status/1383803765275303949
diff --git a/pipe alias.md b/pipe alias.md
new file mode 100644
index 000000000..a16fd11c4
--- /dev/null
+++ b/pipe alias.md	
@@ -0,0 +1,10 @@
+# pipe alias
+
+- a [[feature]]
+  - [[markdown extension]]
+  - [[pull]] [[pipe aliases]] [[bar renaming]]
+  - [[s5bug]] 
+    - https://twitter.com/Fish_CTO/status/1462144240377499653
+    - https://twitter.com/Fish_CTO/status/1462151964322459654
+- [[push]] [[do]]
+  - implement this and [[equals]]
\ No newline at end of file
diff --git a/pipe alias|pipe aliases.md b/pipe alias|pipe aliases.md
new file mode 100644
index 000000000..a159cb92c
--- /dev/null
+++ b/pipe alias|pipe aliases.md	
@@ -0,0 +1,2 @@
+# pipe alias|pipe aliases
+
diff --git a/pseudonym.md b/pseudonym.md
new file mode 100644
index 000000000..fded6388a
--- /dev/null
+++ b/pseudonym.md
@@ -0,0 +1,2 @@
+# pseudonym
+
diff --git a/pseudonymous.md b/pseudonymous.md
new file mode 100644
index 000000000..91fe0563c
--- /dev/null
+++ b/pseudonymous.md
@@ -0,0 +1,4 @@
+# pseudonymous
+
+- [[Flancian]] is my [[pseudonym]]. It's not hard to find who I am "really", and I don't care if you do. But in Flancia I'm just a Flancian.
+
diff --git a/revolution.md b/revolution.md
index 121e63de3..73ae31304 100644
--- a/revolution.md
+++ b/revolution.md
@@ -1,6 +1,7 @@
 # Revolution
 
 - a [[thing]]
+  - [[pull]] [[revolutions]]
   - [[political action]] 
   - ocassionally, but not necessarily in the end, [[disruptive]]
     - my proposal for the revolution is the [[flancian revolution]], which is designed to be reasonably all-optional
@@ -9,11 +10,11 @@
   - [[aristotle]] describes two types of [[political revolution]]:
     - [[complete change]] from one [[constitution]] to another
     - [[modification]] of an existing constitution.
-- [[protopoi]] might be the [[space]] of composable [[atomic revolutions]].
-  - I like to think of [[flancia]] as the world as it could be, improved through a series of [[peaceful]] revolutions.
+- I like to think of [[flancia]] as the world as it could be, improved through a series of [[peaceful]] revolutions.
+  - [[protopoi]] might be the [[space]] of composable [[atomic revolutions]].
   - I am a [[flancian]] and this [[agora]] is meant to be a [[manifesto]].
   - [[pull]] [[fourth international]] [[fifth international]] [[sixth international]]
   - https://twitter.com/flancian/status/1368252143338192898
-- [[pull]] [[revolutions]]
+  - https://twitter.com/flancian/status/1462091524985045001
 
 
diff --git a/roam garden.md b/roam garden.md
new file mode 100644
index 000000000..5a93e98b0
--- /dev/null
+++ b/roam garden.md	
@@ -0,0 +1,5 @@
+# roam garden
+
+- a [[project]]
+  - [[go]] https://roam.garden
+
diff --git a/round one.md b/round one.md
new file mode 100644
index 000000000..81e6febc5
--- /dev/null
+++ b/round one.md	
@@ -0,0 +1,8 @@
+# round one
+
+- a [[thing]].
+  - a [[step]] in a [[process]]
+    - often one of many.
+    - [[time lapse]]
+  - [[push]] [[rounds]]
+
diff --git a/round.md b/round.md
new file mode 100644
index 000000000..ab6a26526
--- /dev/null
+++ b/round.md
@@ -0,0 +1,4 @@
+# round
+
+- [[pull]] [[round one]] [[round two]] [[round three]] [[round four]]
+
diff --git a/rounds.md b/rounds.md
new file mode 100644
index 000000000..553058f1a
--- /dev/null
+++ b/rounds.md
@@ -0,0 +1,2 @@
+# rounds
+
diff --git a/shakyamuni.md b/shakyamuni.md
new file mode 100644
index 000000000..1bc8c4f7c
--- /dev/null
+++ b/shakyamuni.md
@@ -0,0 +1,4 @@
+# shakyamuni
+
+- [[pull]] [[buddha shakyamuni]] [[gautama buddha]] [[siddharta gautama]] [[siddhattha gotama]]
+
diff --git a/siddharta gautama.md b/siddharta gautama.md
new file mode 100644
index 000000000..a286e0332
--- /dev/null
+++ b/siddharta gautama.md	
@@ -0,0 +1,7 @@
+# siddharta gautama
+
+- a [[person]].
+  - [[bodhisattva]] [[arahant]] [[buddha]]
+  - [[pull]] [[shakyamuni]]
+  - [[wp]] https://en.wikipedia.org/wiki/Gautama_Buddha
+
diff --git a/social knowledge graphs.md b/social knowledge graphs.md
new file mode 100644
index 000000000..787922c13
--- /dev/null
+++ b/social knowledge graphs.md	
@@ -0,0 +1,6 @@
+# social knowledge graphs
+
+- a [[list]].
+  - [[pull]] [[social knowledge graph]]
+  - the [[agora]].
+
diff --git a/tournament.md b/tournament.md
new file mode 100644
index 000000000..196d3bb8d
--- /dev/null
+++ b/tournament.md
@@ -0,0 +1,5 @@
+# tournament
+
+- Each [[twitter poll]] is a tournament, or a tournament [[round]] at least.
+  - [[pull]] [[cat tournament]]
+
diff --git a/twitter poll.md b/twitter poll.md
new file mode 100644
index 000000000..8370cda29
--- /dev/null
+++ b/twitter poll.md	
@@ -0,0 +1,4 @@
+# twitter poll
+
+- [[pull]] [[agora polls]]
+