Index: doc/proposals/concurrency/annex/glossary.tex
===================================================================
--- doc/proposals/concurrency/annex/glossary.tex	(revision b3ffb612091a2331c4a159c6181e6740443af680)
+++ doc/proposals/concurrency/annex/glossary.tex	(revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a)
@@ -4,5 +4,5 @@
 {name={callsite-locking}}
 {
-Locking done by the calling routine. With this technique, a routine calling a monitor routine will aquire the monitor \emph{before} making the call to the actuall routine.
+Locking done by the calling routine. With this technique, a routine calling a monitor routine aquires the monitor \emph{before} making the call to the actuall routine.
 }
 
@@ -10,5 +10,5 @@
 {name={entry-point-locking}}
 {
-Locking done by the called routine. With this technique, a monitor routine called by another routine will aquire the monitor \emph{after} entering the routine body but prior to any other code.
+Locking done by the called routine. With this technique, a monitor routine called by another routine aquires the monitor \emph{after} entering the routine body but prior to any other code.
 }
 
@@ -22,5 +22,5 @@
 {name={multiple-acquisition}}
 {
-Any locking technique which allow any single thread to acquire a lock multiple times.
+Any locking technique that allows a single thread to acquire the same lock multiple times.
 }
 
@@ -35,5 +35,5 @@
 {name={user-level thread}}
 {
-Threads created and managed inside user-space. Each thread has its own stack and its own thread of execution. User-level threads are insisible to the underlying operating system.
+Threads created and managed inside user-space. Each thread has its own stack and its own thread of execution. User-level threads are invisible to the underlying operating system.
 
 \textit{Synonyms : User threads, Lightweight threads, Green threads, Virtual threads, Tasks.}
@@ -51,5 +51,5 @@
 {name={fiber}}
 {
-Fibers are non-preemptive user-level threads. They share most of the caracteristics of user-level threads except that they cannot be preempted by an other fiber.
+Fibers are non-preemptive user-level threads. They share most of the caracteristics of user-level threads except that they cannot be preempted by another fiber.
 
 \textit{Synonyms : Tasks.}
@@ -59,5 +59,5 @@
 {name={job}}
 {
-Unit of work, often send to a thread pool or worker pool to be executed. Has neither its own stack or its own thread of execution.
+Unit of work, often sent to a thread pool or worker pool to be executed. Has neither its own stack nor its own thread of execution.
 
 \textit{Synonyms : Tasks.}
@@ -75,13 +75,5 @@
 {name={cluster}}
 {
-TBD...
-
-\textit{Synonyms : None.}
-}
-
-\longnewglossaryentry{cfacpu}
-{name={processor}}
-{
-TBD...
+A group of \gls{kthread} executed in isolation.
 
 \textit{Synonyms : None.}
@@ -91,5 +83,5 @@
 {name={thread}}
 {
-TBD...
+User level threads that are the default in \CFA. Generally declared using the \code{thread} keyword.
 
 \textit{Synonyms : None.}
@@ -99,5 +91,5 @@
 {name={preemption}}
 {
-TBD...
+Involuntary context switch imposed on threads at a specified rate.
 
 \textit{Synonyms : None.}
Index: doc/proposals/concurrency/annex/local.bib
===================================================================
--- doc/proposals/concurrency/annex/local.bib	(revision b3ffb612091a2331c4a159c6181e6740443af680)
+++ doc/proposals/concurrency/annex/local.bib	(revision cf966b55ed3bd25f2fa0711a1114e05eaf36716a)
@@ -38,4 +38,5 @@
 	keywords 	= {Intel, TBB},
 	title 	= {Intel Thread Building Blocks},
+	note		= "\url{https://www.threadingbuildingblocks.org/}"
 }
 
@@ -74,5 +75,5 @@
 	title 	= {TwoHardThings},
 	author	= {Martin Fowler},
-	address	= {https://martinfowler.com/bliki/TwoHardThings.html},
+	howpublished= "\url{https://martinfowler.com/bliki/TwoHardThings.html}",
 	year		= 2009
 }
@@ -88,21 +89,50 @@
 }
 
-@misc{affinityLinux,
+@book{Herlihy93,
+	title={Transactional memory: Architectural support for lock-free data structures},
+	author={Herlihy, Maurice and Moss, J Eliot B},
+	volume={21},
+	number={2},
+	year={1993},
+	publisher={ACM}
+}
+
+@manual{affinityLinux,
 	title		= "{Linux man page - sched\_setaffinity(2)}"
 }
 
-@misc{affinityWindows,
+@manual{affinityWindows,
 	title		= "{Windows (vs.85) - SetThreadAffinityMask function}"
 }
 
-@misc{affinityFreebsd,
+@manual{switchToWindows,
+	title		= "{Windows (vs.85) - SwitchToFiber function}"
+}
+
+@manual{affinityFreebsd,
 	title		= "{FreeBSD General Commands Manual - CPUSET(1)}"
 }
 
-@misc{affinityNetbsd,
+@manual{affinityNetbsd,
 	title		= "{NetBSD Library Functions Manual - AFFINITY(3)}"
 }
 
-@misc{affinityMacosx,
+@manual{affinityMacosx,
 	title		= "{Affinity API Release Notes for OS X v10.5}"
 }
+
+
+@misc{NodeJs,
+	title		= "{Node.js}",
+	howpublished= "\url{https://nodejs.org/en/}",
+}
+
+@misc{SpringMVC,
+	title		= "{Spring Web MVC}",
+	howpublished= "\url{https://docs.spring.io/spring/docs/current/spring-framework-reference/web.html}",
+}
+
+@misc{Django,
+	title		= "{Django}",
+	howpublished= "\url{https://www.djangoproject.com/}",
+}