@@ -69,7 +69,7 @@ or `48.879`, whose parent is `~mun`, `0xef`, `239`. The parent of
6969
7070A `span` defines a set (finite or infinite) of `noun`s and ascribes some semantics to it. There is no Hoon syntax for a `span`; it is always produced as the inferred range of an expression (`twig`).
7171
72−*See [basic types](../basic)*
72+*See [basic types](../../hoon/basic/#-type-span-and-mold)*
7373
7474###### `mold`: a type constructor / validator
7575
@@ -78,7 +78,7 @@ A mold is an idempotent `gate` (function), accepting any `noun` and normalizing
7878- `icon`: the `span` of a `mold`
7979- `bunt`: *(TODO: ??)*
8080
81−*See [`mold`](../twig/buc-mold/)*
81+*See [`mold` `twig`s](../../hoon/twig/buc-mold/)*
8282
8383###### `gate`: a function, lambda or closure
8484
@@ -91,13 +91,13 @@ The `payload` of a `gate` has a shape of `{sample context}`.
9191- `sample`: the argument *(TODO: or plural?)* of a `gate`
9292- `context`: the subject in *(TODO: against?)* which a `gate` was defined
9393
94−*See [basic types](../basic)*
94++*See [basic types](../../hoon/basic/#-core-p-span-q-map-term-span), [`%-` or `:call`](../../hoon/twig/cen-call/hep-call/) (the `twig` for calling a `gate`)*
9595
9696###### `arm`: a named, functionally-computed attribute of a `core`
9797
9898The `twig` of each `arm` is compiled to a Nock formula, with the enclosing `core` itself as the subject.
9999
100−*See [basic types](../basic)*
100+*See [basic types](../../hoon/basic)*
101101
102102###### `core`: a code-data `cell`
103103
@@ -127,7 +127,7 @@ Every `dry` `core` has a `metal` *(TODO: check)* which defines its *variance* mo
127127- `zync`: *covariant*
128128- `iron`: *contravariant*
129129
130−*See [advanced types](../advanced)*
130+*See [advanced types](../../hoon/advanced)*
131131
132132###### `foot`: a `wet` or `dry` `twig`
133133
@@ -144,6 +144,8 @@ A Hoon `atom` is a Nock `atom`, with two additional pieces of metadata (TODO: ?)
144144- `warm`: if the `unit` is `~` (null), any `atom` is in the `span`
145145- `cold`: if the `unit` is `[~ x]`, where `x` is any `atom`, its only legal value is the constant `x`. *(TODO: what does this actually mean? What is the consequence of illegality?)*
146146
147+*See [basic types](../../hoon/basic/#-atom-p-term-q-unit-atom)*
148+
147149###### `aura`: a soft `atom` type
148150
149151*alternately `odor`*
@@ -167,7 +169,7 @@ A Hoon `atom` is a Nock `atom`, with two additional pieces of metadata (TODO: ?)
167169
168170- `tape` (`(list char)`): a `tape` is not an `aura`, but a `mold` for a collection where every item has an `aura` of `char` *(TODO: is this for easy indexing vs `@t`?)*
169171
170−*See [basic types](../basic)*
172+*See [basic types](../../hoon/basic/#-atom-p-term-q-unit-atom)*
171173
172174###### `loobean`: a Hoon boolean
173175
@@ -193,11 +195,11 @@ The vast majority of `twig`s have a *regular form*, beginning with either a keyw
193195
194196- `sigil`: a keyword used to begin a `twig`
195197
196−Hoon does not have reserved words, but `sigil`s (prefixed with `:`), which are effectively aliases for `rune`s. For example, [`:cons` is `:-`](../twig/col-cel/hep-cons).
198+Hoon does not have reserved words, but `sigil`s (prefixed with `:`), which are effectively aliases for `rune`s. For example, [`:cons` is `:-`](../../hoon/twig/col-cel/hep-cons).
197199
198−- `rune`: a pair of ASCII symbols used to begin a `twig` - the first symbol represents a family of related `twig`s. For example, the [`:` family](../twig/col-cell/) are all for cell-construction.
200+- `rune`: a pair of ASCII symbols used to begin a `twig` - the first symbol represents a family of related `twig`s. For example, the [`:` family](../../hoon/twig/col-cell/) are all for cell-construction.
199201
200−*See [`twig` concept](../concepts) and [expressions](../twig/)*
202+*See [`twig` concept](../../hoon/concepts/#-twig-expression) and [expressions](../../hoon/twig/)*
201203
202204###### `limb`: attribute or variable reference
203205
@@ -206,7 +208,7 @@ To resolve a `limb` named "foo", the `subject` is searched depth-first, head-fir
206208- `leg`: a subexpression, or subtree of the `subject`. usually another `twig`, sometimes a symbol (`@tas`) or `wing`
207209- `wing`: a list of `limb`s
208210
209−*See [Limbs and wings](../twig/limb)*
211+*See [Limbs and wings](../../hoon/twig/limb)*
210212
211213###### `face`: a named variable
212214
@@ -222,7 +224,7 @@ A `face` is a `span` *(TODO: ?)* with a label (`@tas`) wrapped around it.
222224 - `alias`: a `face` that is a lazy reference to another `face`
223225 - `bridge`: a `face` that references a `twig`, against which the `face` label is resolved
224226
225−*See [advanced types](../advanced)*
227+*See [advanced types](../../hoon/advanced/#-face-aliases-and-bridges)*
226228
227229###### `nest`: a type-casting operation
228230