diff --git a/4coder_lib/4coder_string.h b/4coder_lib/4coder_string.h
index 4d856f1d..87b39d63 100644
--- a/4coder_lib/4coder_string.h
+++ b/4coder_lib/4coder_string.h
@@ -1,5 +1,5 @@
 /*
-4coder_string.h - Version 1.0.80
+4coder_string.h - Version 1.0.102
 no warranty implied; use at your own risk
 
 This software is in the public domain. Where that dedication is not
@@ -42,7 +42,7 @@ typedef int32_t b32_4tech;
 #if !defined(Assert)
 # define Assert(n) do{ if (!(n)) *(int*)0 = 0xA11E; }while(0)
 #endif
-// standard preamble end 
+// standard preamble end
 
 #if !defined(FSTRING_LINK)
 # define FSTRING_LINK static
@@ -296,7 +296,7 @@ FSTRING_LINK b32_4tech             string_set_match(void *str_set, i32_4tech ite
 //
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_slash(char c)
 {
     return (c == '\\' || c == '/');
@@ -304,7 +304,7 @@ char_is_slash(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_upper(char c)
 {
     return (c >= 'A' && c <= 'Z');
@@ -312,7 +312,7 @@ char_is_upper(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_upper_utf8(char c)
 {
     return ((c >= 'A' && c <= 'Z') || (unsigned char)c >= 128);
@@ -320,7 +320,7 @@ char_is_upper_utf8(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_lower(char c)
 {
     return (c >= 'a' && c <= 'z');
@@ -328,7 +328,7 @@ char_is_lower(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_lower_utf8(u8_4tech c)
 {
     return ((c >= 'a' && c <= 'z') || (unsigned char)c >= 128);
@@ -336,7 +336,7 @@ char_is_lower_utf8(u8_4tech c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE char
+FSTRING_INLINE char
 char_to_upper(char c)
 {
     return (c >= 'a' && c <= 'z') ? c + (char)('A' - 'a') : c;
@@ -344,7 +344,7 @@ char_to_upper(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE char
+FSTRING_INLINE char
 char_to_lower(char c)
 {
     return (c >= 'A' && c <= 'Z') ? c - (char)('A' - 'a') : c;
@@ -352,7 +352,7 @@ char_to_lower(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_whitespace(char c)
 {
     return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
@@ -360,7 +360,7 @@ char_is_whitespace(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_numeric(char c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_');
@@ -368,7 +368,7 @@ char_is_alpha_numeric(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_numeric_utf8(u8_4tech c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_' || (unsigned char)c >= 128);
@@ -376,7 +376,7 @@ char_is_alpha_numeric_utf8(u8_4tech c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_numeric_true(char c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'));
@@ -384,7 +384,7 @@ char_is_alpha_numeric_true(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_numeric_true_utf8(u8_4tech c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || (unsigned char)c >= 128);
@@ -392,7 +392,7 @@ char_is_alpha_numeric_true_utf8(u8_4tech c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha(char c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_');
@@ -400,7 +400,7 @@ char_is_alpha(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_utf8(u8_4tech c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || (unsigned char)c >= 128);
@@ -408,7 +408,7 @@ char_is_alpha_utf8(u8_4tech c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_true(char c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'));
@@ -416,7 +416,7 @@ char_is_alpha_true(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_alpha_true_utf8(u8_4tech c)
 {
     return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (unsigned char)c >= 128);
@@ -424,7 +424,7 @@ char_is_alpha_true_utf8(u8_4tech c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_hex(char c)
 {
     return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'));
@@ -432,7 +432,7 @@ char_is_hex(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_hex_utf8(u8_4tech c)
 {
     return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f') || (unsigned char)c >= 128);
@@ -440,7 +440,7 @@ char_is_hex_utf8(u8_4tech c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_numeric(char c)
 {
     return (c >= '0' && c <= '9');
@@ -448,7 +448,7 @@ char_is_numeric(char c)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 char_is_numeric_utf8(u8_4tech c)
 {
     return ((c >= '0' && c <= '9') || (unsigned char)c >= 128);
@@ -462,7 +462,7 @@ char_is_numeric_utf8(u8_4tech c)
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 make_string_cap(void *str, i32_4tech size, i32_4tech mem_size){
     String result;
     result.str = (char*)str;
@@ -473,7 +473,7 @@ make_string_cap(void *str, i32_4tech size, i32_4tech mem_size){
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 make_string(void *str, i32_4tech size){
     String result;
     result.str = (char*)str;
@@ -484,7 +484,7 @@ make_string(void *str, i32_4tech size){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 str_size(char *str)
 {
     i32_4tech i = 0;
@@ -494,7 +494,7 @@ str_size(char *str)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 make_string_slowly(void *str)
 {
     String result;
@@ -507,7 +507,7 @@ make_string_slowly(void *str)
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 substr_tail(String str, i32_4tech start)
 {
     String result;
@@ -519,7 +519,7 @@ substr_tail(String str, i32_4tech start)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 substr(String str, i32_4tech start, i32_4tech size)
 {
     String result;
@@ -534,7 +534,7 @@ substr(String str, i32_4tech start, i32_4tech size)
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 skip_whitespace(String str)
 {
     String result = {0};
@@ -547,7 +547,7 @@ skip_whitespace(String str)
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 skip_whitespace_measure(String str, i32_4tech *skip_length)
 {
     String result = {0};
@@ -560,7 +560,7 @@ skip_whitespace_measure(String str, i32_4tech *skip_length)
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 chop_whitespace(String str)
 {
     String result = {0};
@@ -572,7 +572,7 @@ chop_whitespace(String str)
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 skip_chop_whitespace(String str)
 {
     str = skip_whitespace(str);
@@ -583,7 +583,7 @@ skip_chop_whitespace(String str)
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 skip_chop_whitespace_measure(String str, i32_4tech *skip_length)
 {
     str = skip_whitespace_measure(str, skip_length);
@@ -593,7 +593,7 @@ skip_chop_whitespace_measure(String str, i32_4tech *skip_length)
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 tailstr(String str)
 {
     String result;
@@ -611,7 +611,7 @@ tailstr(String str)
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_cc(char *a, char *b){
     for (i32_4tech i = 0;; ++i){
         if (a[i] != b[i]){
@@ -626,7 +626,7 @@ match_cc(char *a, char *b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_sc(String a, char *b){
     i32_4tech i = 0;
     for (; i < a.size; ++i){
@@ -643,7 +643,7 @@ match_sc(String a, char *b){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 match_cs(char *a, String b){
     return(match_sc(b,a));
 }
@@ -651,7 +651,7 @@ match_cs(char *a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_ss(String a, String b){
     if (a.size != b.size){
         return 0;
@@ -667,37 +667,47 @@ match_ss(String a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_ccl(char *a, char *b, i32_4tech *len){
+    if (a == 0){
+        a = "";
+    }
+    if (b == 0){
+        b = "";
+    }
+    
     i32_4tech i;
     for (i = 0; b[i] != 0; ++i){
         if (a[i] != b[i]){
-            return 0;
+            return(0);
         }
     }
     *len = i;
-    return 1;
+    return(1);
 }
 #endif
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_scl(String a, char *b, i32_4tech *len){
+    if (b == 0){
+        b = "";
+    }
     i32_4tech i;
     for (i = 0; b[i] != 0; ++i){
-        if (a.str[i] != b[i] || i == a.size){
-            return 0;
+        if (i == a.size || a.str[i] != b[i]){
+            return(0);
         }
     }
     *len = i;
-    return 1;
+    return(1);
 }
 #endif
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 match_part_cc(char *a, char *b){
     i32_4tech x;
     return match_part_ccl(a,b,&x);
@@ -706,7 +716,7 @@ match_part_cc(char *a, char *b){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 match_part_sc(String a, char *b){
     i32_4tech x;
     return match_part_scl(a,b,&x);
@@ -715,7 +725,7 @@ match_part_sc(String a, char *b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_cs(char *a, String b){
     for (i32_4tech i = 0; i != b.size; ++i){
         if (a[i] != b.str[i]){
@@ -728,23 +738,23 @@ match_part_cs(char *a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_ss(String a, String b){
     if (a.size < b.size){
-        return 0;
+        return(0);
     }
     for (i32_4tech i = 0; i < b.size; ++i){
         if (a.str[i] != b.str[i]){
-            return 0;
+            return(0);
         }
     }
-    return 1;
+    return(1);
 }
 #endif
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_insensitive_cc(char *a, char *b){
     for (i32_4tech i = 0;; ++i){
         if (char_to_upper(a[i]) !=
@@ -760,7 +770,7 @@ match_insensitive_cc(char *a, char *b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_insensitive_sc(String a, char *b){
     i32_4tech i = 0;
     for (; i < a.size; ++i){
@@ -778,7 +788,7 @@ match_insensitive_sc(String a, char *b){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 match_insensitive_cs(char *a, String b){
     return match_insensitive_sc(b,a);
 }
@@ -786,7 +796,7 @@ match_insensitive_cs(char *a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_insensitive_ss(String a, String b){
     if (a.size != b.size){
         return 0;
@@ -803,7 +813,7 @@ match_insensitive_ss(String a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_insensitive_ccl(char *a, char *b, i32_4tech *len){
     i32_4tech i;
     for (i = 0; b[i] != 0; ++i){
@@ -818,7 +828,7 @@ match_part_insensitive_ccl(char *a, char *b, i32_4tech *len){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_insensitive_scl(String a, char *b, i32_4tech *len){
     i32_4tech i;
     for (i = 0; b[i] != 0; ++i){
@@ -834,7 +844,7 @@ match_part_insensitive_scl(String a, char *b, i32_4tech *len){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 match_part_insensitive_cc(char *a, char *b){
     i32_4tech x;
     return match_part_insensitive_ccl(a,b,&x);
@@ -843,7 +853,7 @@ match_part_insensitive_cc(char *a, char *b){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 match_part_insensitive_sc(String a, char *b){
     i32_4tech x;
     return match_part_insensitive_scl(a,b,&x);
@@ -852,7 +862,7 @@ match_part_insensitive_sc(String a, char *b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_insensitive_cs(char *a, String b){
     for (i32_4tech i = 0; i != b.size; ++i){
         if (char_to_upper(a[i]) != char_to_upper(b.str[i])){
@@ -865,7 +875,7 @@ match_part_insensitive_cs(char *a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 match_part_insensitive_ss(String a, String b){
     if (a.size < b.size){
         return(0);
@@ -881,7 +891,7 @@ match_part_insensitive_ss(String a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 compare_cc(char *a, char *b){
     i32_4tech i = 0, r = 0;
     while (a[i] == b[i] && a[i] != 0){
@@ -894,7 +904,7 @@ compare_cc(char *a, char *b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 compare_sc(String a, char *b){
     i32_4tech i = 0, r = 0;
     while (i < a.size && a.str[i] == b[i]){
@@ -917,7 +927,7 @@ compare_sc(String a, char *b){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE i32_4tech
+FSTRING_INLINE i32_4tech
 compare_cs(char *a, String b){
     i32_4tech r = -compare_sc(b,a);
     return(r);
@@ -926,7 +936,7 @@ compare_cs(char *a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 compare_ss(String a, String b){
     i32_4tech i = 0, r = 0;
     i32_4tech m = a.size;
@@ -954,7 +964,7 @@ compare_ss(String a, String b){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_c_char(char *str, i32_4tech start, char character){
     i32_4tech i = start;
     while (str[i] != character && str[i] != 0) ++i;
@@ -964,7 +974,7 @@ find_c_char(char *str, i32_4tech start, char character){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_s_char(String str, i32_4tech start, char character){
     i32_4tech i = start;
     while (i < str.size && str.str[i] != character) ++i;
@@ -974,7 +984,7 @@ find_s_char(String str, i32_4tech start, char character){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 rfind_s_char(String str, i32_4tech start, char character){
     i32_4tech i = start;
     while (i >= 0 && str.str[i] != character) --i;
@@ -984,7 +994,7 @@ rfind_s_char(String str, i32_4tech start, char character){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_c_chars(char *str, i32_4tech start, char *characters){
     i32_4tech i = start, j;
     while (str[i] != 0){
@@ -1001,7 +1011,7 @@ find_c_chars(char *str, i32_4tech start, char *characters){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_s_chars(String str, i32_4tech start, char *characters){
     i32_4tech i = start, j;
     while (i < str.size){
@@ -1018,7 +1028,7 @@ find_s_chars(String str, i32_4tech start, char *characters){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_substr_c(char *str, i32_4tech start, String seek){
     i32_4tech i, j, k;
     b32_4tech hit;
@@ -1047,7 +1057,7 @@ find_substr_c(char *str, i32_4tech start, String seek){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_substr_s(String str, i32_4tech start, String seek){
     i32_4tech stop_at, i, j, k;
     b32_4tech hit;
@@ -1076,7 +1086,7 @@ find_substr_s(String str, i32_4tech start, String seek){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 rfind_substr_s(String str, i32_4tech start, String seek){
     i32_4tech i, j, k;
     b32_4tech hit;
@@ -1107,7 +1117,7 @@ rfind_substr_s(String str, i32_4tech start, String seek){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_substr_insensitive_c(char *str, i32_4tech start, String seek){
     i32_4tech i, j, k;
     b32_4tech hit;
@@ -1141,7 +1151,7 @@ find_substr_insensitive_c(char *str, i32_4tech start, String seek){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 find_substr_insensitive_s(String str, i32_4tech start, String seek){
     i32_4tech i, j, k;
     i32_4tech stop_at;
@@ -1177,7 +1187,7 @@ find_substr_insensitive_s(String str, i32_4tech start, String seek){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 has_substr_c(char *s, String seek){
     return (s[find_substr_c(s, 0, seek)] != 0);
 }
@@ -1185,7 +1195,7 @@ has_substr_c(char *s, String seek){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 has_substr_s(String s, String seek){
     return (find_substr_s(s, 0, seek) < s.size);
 }
@@ -1193,7 +1203,7 @@ has_substr_s(String s, String seek){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 has_substr_insensitive_c(char *s, String seek){
     return (s[find_substr_insensitive_c(s, 0, seek)] != 0);
 }
@@ -1201,7 +1211,7 @@ has_substr_insensitive_c(char *s, String seek){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 has_substr_insensitive_s(String s, String seek){
     return (find_substr_insensitive_s(s, 0, seek) < s.size);
 }
@@ -1213,7 +1223,7 @@ has_substr_insensitive_s(String s, String seek){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 copy_fast_unsafe_cc(char *dest, char *src){
     char *start = dest;
     while (*src != 0){
@@ -1227,7 +1237,7 @@ copy_fast_unsafe_cc(char *dest, char *src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 copy_fast_unsafe_cs(char *dest, String src){
     i32_4tech i = 0;
     while (i != src.size){
@@ -1240,7 +1250,7 @@ copy_fast_unsafe_cs(char *dest, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 copy_checked_ss(String *dest, String src){
     char *dest_str;
     i32_4tech i;
@@ -1258,7 +1268,7 @@ copy_checked_ss(String *dest, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 copy_checked_cs(char *dest, i32_4tech dest_cap, String src){
     i32_4tech i;
     if (dest_cap < src.size){
@@ -1273,7 +1283,7 @@ copy_checked_cs(char *dest, i32_4tech dest_cap, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 copy_partial_sc(String *dest, char *src){
     i32_4tech i = 0;
     i32_4tech memory_size = dest->memory_size;
@@ -1292,7 +1302,7 @@ copy_partial_sc(String *dest, char *src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 copy_partial_ss(String *dest, String src){
     char *dest_str = dest->str;
     i32_4tech memory_size = dest->memory_size;
@@ -1311,7 +1321,7 @@ copy_partial_ss(String *dest, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 copy_partial_cs(char *dest, i32_4tech dest_cap, String src){
     b32_4tech result = 0;
     i32_4tech copy_size = dest_cap;
@@ -1329,7 +1339,7 @@ copy_partial_cs(char *dest, i32_4tech dest_cap, String src){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE i32_4tech
+FSTRING_INLINE i32_4tech
 copy_cc(char *dest, char *src){
     return copy_fast_unsafe_cc(dest, src);
 }
@@ -1337,7 +1347,7 @@ copy_cc(char *dest, char *src){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE void
+FSTRING_INLINE void
 copy_ss(String *dest, String src){
     copy_checked_ss(dest, src);
 }
@@ -1345,7 +1355,7 @@ copy_ss(String *dest, String src){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE void
+FSTRING_INLINE void
 copy_sc(String *dest, char *src){
     copy_partial_sc(dest, src);
 }
@@ -1353,7 +1363,7 @@ copy_sc(String *dest, char *src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_checked_ss(String *dest, String src){
     String end;
     end = tailstr(*dest);
@@ -1367,7 +1377,7 @@ append_checked_ss(String *dest, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_partial_sc(String *dest, char *src){
     String end = tailstr(*dest);
     b32_4tech result = copy_partial_sc(&end, src);
@@ -1378,7 +1388,7 @@ append_partial_sc(String *dest, char *src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_partial_ss(String *dest, String src){
     String end = tailstr(*dest);
     b32_4tech result = copy_partial_ss(&end, src);
@@ -1389,7 +1399,7 @@ append_partial_ss(String *dest, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_s_char(String *dest, char c){
     b32_4tech result = 0;
     if (dest->size < dest->memory_size){
@@ -1402,7 +1412,7 @@ append_s_char(String *dest, char c){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 append_ss(String *dest, String src){
     return append_partial_ss(dest, src);
 }
@@ -1410,14 +1420,14 @@ append_ss(String *dest, String src){
 
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE b32_4tech
+FSTRING_INLINE b32_4tech
 append_sc(String *dest, char *src){
     return append_partial_sc(dest, src);
 }
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 terminate_with_null(String *str){
     b32_4tech result = 0;
     if (str->size < str->memory_size){
@@ -1429,7 +1439,7 @@ terminate_with_null(String *str){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_padding(String *dest, char c, i32_4tech target_size){
     b32_4tech result = 1;
     i32_4tech offset = target_size - dest->size;
@@ -1452,7 +1462,7 @@ append_padding(String *dest, char c, i32_4tech target_size){
 //
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 replace_char(String *str, char replace, char with){
     char *s = str->str;
     i32_4tech i = 0;
@@ -1464,7 +1474,7 @@ replace_char(String *str, char replace, char with){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_lower_cc(char *src, char *dst){
     for (; *src != 0; ++src){
         *dst++ = char_to_lower(*src);
@@ -1475,7 +1485,7 @@ to_lower_cc(char *src, char *dst){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_lower_ss(String *dst, String src){
     i32_4tech i = 0;
     i32_4tech size = src.size;
@@ -1493,7 +1503,7 @@ to_lower_ss(String *dst, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_lower_s(String *str){
     i32_4tech i = 0;
     i32_4tech size = str->size;
@@ -1506,7 +1516,7 @@ to_lower_s(String *str){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_upper_cc(char *src, char *dst){
     for (; *src != 0; ++src){
         *dst++ = char_to_upper(*src);
@@ -1517,7 +1527,7 @@ to_upper_cc(char *src, char *dst){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_upper_ss(String *dst, String src){
     i32_4tech i = 0;
     i32_4tech size = src.size;
@@ -1535,7 +1545,7 @@ to_upper_ss(String *dst, String src){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_upper_s(String *str){
     i32_4tech i = 0;
     i32_4tech size = str->size;
@@ -1548,7 +1558,7 @@ to_upper_s(String *str){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK void
+FSTRING_LINK void
 to_camel_cc(char *src, char *dst){
     char *c, ch;
     i32_4tech is_first = 1;
@@ -1578,7 +1588,7 @@ to_camel_cc(char *src, char *dst){
 //
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 int_to_str_size(i32_4tech x){
     i32_4tech size = 1;
     if (x < 0){
@@ -1594,7 +1604,7 @@ int_to_str_size(i32_4tech x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 int_to_str(String *dest, i32_4tech x){
     b32_4tech result = 1;
     char *str = dest->str;
@@ -1641,7 +1651,7 @@ int_to_str(String *dest, i32_4tech x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_int_to_str(String *dest, i32_4tech x){
     String last_part = tailstr(*dest);
     b32_4tech result = int_to_str(&last_part, x);
@@ -1653,7 +1663,7 @@ append_int_to_str(String *dest, i32_4tech x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 u64_to_str_size(uint64_t x){
     i32_4tech size = 1;
     x /= 10;
@@ -1666,7 +1676,7 @@ u64_to_str_size(uint64_t x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 u64_to_str(String *dest, uint64_t x){
     b32_4tech result = 1;
     char *str = dest->str;
@@ -1705,7 +1715,7 @@ u64_to_str(String *dest, uint64_t x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_u64_to_str(String *dest, uint64_t x){
     String last_part = tailstr(*dest);
     b32_4tech result = u64_to_str(&last_part, x);
@@ -1740,7 +1750,7 @@ get_float_vars(float x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 float_to_str_size(float x){
     Float_To_Str_Variables vars = get_float_vars(x);
     i32_4tech size = vars.negative + int_to_str_size(vars.int_part) + 1 + int_to_str_size(vars.dec_part);
@@ -1749,7 +1759,7 @@ float_to_str_size(float x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 append_float_to_str(String *dest, float x){
     b32_4tech result = 1;
     Float_To_Str_Variables vars = get_float_vars(x);
@@ -1767,7 +1777,7 @@ append_float_to_str(String *dest, float x){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 float_to_str(String *dest, float x){
     b32_4tech result = 1;
     dest->size = 0;
@@ -1778,7 +1788,7 @@ float_to_str(String *dest, float x){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 str_is_int_c(char *str){
     b32_4tech result = 1;
     for (; *str; ++str){
@@ -1793,7 +1803,7 @@ str_is_int_c(char *str){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 str_is_int_s(String str){
     b32_4tech result = 1;
     for (i32_4tech i = 0; i < str.size; ++i){
@@ -1808,7 +1818,7 @@ str_is_int_s(String str){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 str_to_int_c(char *str){
     i32_4tech x = 0;
     for (; *str; ++str){
@@ -1827,7 +1837,7 @@ str_to_int_c(char *str){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 str_to_int_s(String str){
     i32_4tech x, i;
     if (str.size == 0){
@@ -1845,7 +1855,7 @@ str_to_int_s(String str){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 hexchar_to_int(char c){
     i32_4tech x = 0;
     if (c >= '0' && c <= '9'){
@@ -1862,14 +1872,14 @@ hexchar_to_int(char c){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK char
+FSTRING_LINK char
 int_to_hexchar(i32_4tech x){
     return (x<10)?((char)x+'0'):((char)x+'a'-10);
 }
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK u32_4tech
+FSTRING_LINK u32_4tech
 hexstr_to_int(String str){
     u32_4tech x;
     i32_4tech i;
@@ -1888,7 +1898,7 @@ hexstr_to_int(String str){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 color_to_hexstr(String *s, u32_4tech color){
     b32_4tech result = 0;
     i32_4tech i;
@@ -1917,7 +1927,7 @@ color_to_hexstr(String *s, u32_4tech color){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 hexstr_to_color(String s, u32_4tech *out){
     b32_4tech result = 0;
     u32_4tech color = 0;
@@ -1942,7 +1952,7 @@ hexstr_to_color(String s, u32_4tech *out){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK i32_4tech
+FSTRING_LINK i32_4tech
 reverse_seek_slash_pos(String str, i32_4tech pos){
     i32_4tech i = str.size - 1 - pos;
     while (i >= 0 && !char_is_slash(str.str[i])){
@@ -1953,21 +1963,21 @@ reverse_seek_slash_pos(String str, i32_4tech pos){
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE i32_4tech
+FSTRING_INLINE i32_4tech
 reverse_seek_slash(String str){
     return(reverse_seek_slash_pos(str, 0));
 }
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 front_of_directory(String dir){
     return substr_tail(dir, reverse_seek_slash(dir) + 1);
 }
 #endif
 
 #if !defined(FSTRING_GUARD)
- FSTRING_INLINE String
+FSTRING_INLINE String
 path_of_directory(String dir){
     return substr(dir, 0, reverse_seek_slash(dir) + 1);
 }
@@ -1975,7 +1985,7 @@ path_of_directory(String dir){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 set_last_folder_sc(String *dir, char *folder_name, char slash){
     b32_4tech result = 0;
     i32_4tech size = reverse_seek_slash(*dir) + 1;
@@ -1994,7 +2004,7 @@ set_last_folder_sc(String *dir, char *folder_name, char slash){
 
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 set_last_folder_ss(String *dir, String folder_name, char slash){
     b32_4tech result = 0;
     i32_4tech size = reverse_seek_slash(*dir) + 1;
@@ -2012,7 +2022,7 @@ set_last_folder_ss(String *dir, String folder_name, char slash){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 file_extension(String str){
     i32_4tech i;
     for (i = str.size - 1; i >= 0; --i){
@@ -2024,7 +2034,7 @@ file_extension(String str){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 remove_extension(String *str){
     b32_4tech result = 0;
     i32_4tech i;
@@ -2040,7 +2050,7 @@ remove_extension(String *str){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 remove_last_folder(String *str){
     b32_4tech result = 0;
     i32_4tech end = reverse_seek_slash_pos(*str, 1);
@@ -2055,7 +2065,7 @@ remove_last_folder(String *str){
 // TODO(allen): Add hash-table extension to string sets.
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 string_set_match_table(void *str_set, i32_4tech item_size, i32_4tech count, String str, i32_4tech *match_index){
     b32_4tech result = 0;
     i32_4tech i = 0;
@@ -2072,7 +2082,7 @@ string_set_match_table(void *str_set, i32_4tech item_size, i32_4tech count, Stri
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK b32_4tech
+FSTRING_LINK b32_4tech
 string_set_match(String *str_set, i32_4tech count, String str, i32_4tech *match_index){
     b32_4tech result = string_set_match_table(str_set, sizeof(String), count, str, match_index);
     return(result);
@@ -2080,7 +2090,7 @@ string_set_match(String *str_set, i32_4tech count, String str, i32_4tech *match_
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 get_first_double_line(String source){
     String line = {0};
     i32_4tech pos0 = find_substr_s(source, 0, make_lit_string("\n\n"));
@@ -2094,7 +2104,7 @@ get_first_double_line(String source){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 get_next_double_line(String source, String line){
     String next = {0};
     i32_4tech pos = (i32_4tech)(line.str - source.str) + line.size;
@@ -2119,7 +2129,7 @@ get_next_double_line(String source, String line){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 get_next_word(String source, String prev_word){
     
     String word = {0};
@@ -2150,7 +2160,7 @@ get_next_word(String source, String prev_word){
 #endif
 
 #if defined(FSTRING_IMPLEMENTATION)
- FSTRING_LINK String
+FSTRING_LINK String
 get_first_word(String source){
     String start_str = make_string(source.str, 0);
     String word = get_next_word(source, start_str);
diff --git a/site/4ed_abstract_document.cpp b/site/4ed_abstract_document.cpp
index d0fc25b9..a701836d 100644
--- a/site/4ed_abstract_document.cpp
+++ b/site/4ed_abstract_document.cpp
@@ -28,21 +28,57 @@ load_enriched_text(char *directory, char *filename){
 
 ////////////////////////////////
 
-struct Alternate_Name{
-    String macro;
-    String public_name;
-};
-
-struct Alternate_Names_Array{
-    Alternate_Name *names;
-};
-
+typedef u32 Mangle_Rule;
 enum{
-    AltName_Standard,
-    AltName_Macro,
-    AltName_Public_Name,
+    MangleRule_None,
+    MangleRule_MacroSig,
+    MangleRule_ToLower,
 };
 
+internal Mangle_Rule
+get_mangle_rule(String mangle){
+    Mangle_Rule result = MangleRule_None;
+    if (match(mangle, "macro sig")){
+        result = MangleRule_MacroSig;
+    }
+    else if (match(mangle, "to lower")){
+        result = MangleRule_ToLower;
+    }
+    return(result);
+}
+
+internal String
+apply_mangle_rule(String name, u32 mangle_rule){
+    String result = {0};
+    switch (mangle_rule){
+        case MangleRule_MacroSig:
+        {
+            result = str_alloc(name.size + 5);
+            fm_align();
+            copy(&result, name);
+            to_upper(&result);
+            append(&result, "_SIG");
+            terminate_with_null(&result);
+        }break;
+        
+        case MangleRule_ToLower:
+        {
+            result = str_alloc(name.size + 1);
+            fm_align();
+            copy(&result, name);
+            to_lower(&result);
+            terminate_with_null(&result);
+        }break;
+        
+        default:
+        {
+            result = name;
+        }break;
+    }
+    
+    return(result);
+}
+
 ////////////////////////////////
 
 enum{
@@ -88,8 +124,8 @@ struct Document_Item{
         
         struct{
             Meta_Unit *unit;
-            Alternate_Names_Array *alt_names;
-            i32 alt_name_type;
+            //Alternate_Names_Array *alt_names;
+            u32 mangle_rule;
         } unit_elements;
         
         struct{
@@ -156,6 +192,7 @@ enum{
     ItemType_Document,
     ItemType_Image,
     ItemType_GenericFile,
+    ItemType_MetaUnit,
     //
     ItemType_COUNT,
 };
@@ -173,6 +210,9 @@ struct Abstract_Item{
     float w_h_ratio;
     float h_w_ratio;
     Basic_List img_instantiations;
+    
+    // Meta parse members
+    Meta_Unit *unit;
 };
 global Abstract_Item null_abstract_item = {0};
 
@@ -210,16 +250,24 @@ struct Image_Instantiation{
 };
 
 struct Document_System{
+    char *code_dir;
+    char *asset_dir;
+    char *src_dir;
+    
     Basic_List doc_list;
     Basic_List img_list;
     Basic_List file_list;
+    Basic_List meta_list;
     
     Basic_List unresolved_includes;
 };
 
 internal Document_System
-create_document_system(){
+create_document_system(char *code_dir, char *asset_dir, char *src_dir){
     Document_System system = {0};
+    system.code_dir = code_dir;
+    system.asset_dir = asset_dir;
+    system.src_dir = src_dir;
     return(system);
 }
 
@@ -280,13 +328,53 @@ create_abstract_item(Basic_List *list, char *name){
     return(result);
 }
 
+internal char*
+get_null_terminated_version(String str){
+    char *ptr = 0;
+    if (terminate_with_null(&str)){
+        ptr = str.str;
+    }
+    else{
+        String b = str_alloc(str.size + 1);
+        copy(&b, str);
+        terminate_with_null(&b);
+        ptr = b.str;
+    }
+    return(ptr);
+}
+
+internal b32
+create_meta_unit(Document_System *doc_system, String name_str, String file_str){
+    char *name = get_null_terminated_version(name_str);
+    char *file = get_null_terminated_version(file_str);
+    
+    Abstract_Item *item = create_abstract_item(&doc_system->meta_list, name);
+    
+    b32 result = false;
+    if (item != 0){
+        Meta_Unit *unit = fm_push_array(Meta_Unit, 1);
+        *unit = compile_meta_unit(doc_system->code_dir, file, ExpandArray(meta_keywords));
+        
+        if (unit->count != 0){
+            result = true;
+            item->item_type = ItemType_MetaUnit;
+            item->name = name;
+            item->unit = unit;
+        }
+    }
+    
+    return(result);
+}
+
 internal Abstract_Item*
 add_generic_file(Document_System *system, char *source_file, char *extension, char *name){
     Abstract_Item *item = create_abstract_item(&system->file_list, name);
     if (item){
+        char *full_file = fm_str(system->asset_dir, "/", source_file);
+        
         item->item_type = ItemType_GenericFile;
         item->extension = extension;
-        item->source_file = source_file;
+        item->source_file = full_file;
         item->name = name;
     }
     return(item);
@@ -296,15 +384,17 @@ internal Abstract_Item*
 add_image_description(Document_System *system, char *source_file, char *extension, char *name){
     Abstract_Item *item = create_abstract_item(&system->img_list, name);
     if (item != 0){
+        char *full_file = fm_str(system->asset_dir, "/", source_file);
+        
         item->item_type = ItemType_Image;
-        item->extension = extension;
-        item->source_file = source_file;
         item->name = name;
+        item->extension = extension;
+        item->source_file = full_file;
         
         i32 w = 0, h = 0, comp = 0;
-        i32 stbi_r = stbi_info(source_file, &w, &h, &comp);
+        i32 stbi_r = stbi_info(full_file, &w, &h, &comp);
         if (!stbi_r){
-            fprintf(stdout, "Did not find file %s\n", source_file);
+            fprintf(stdout, "Did not find file %s\n", full_file);
             item->w_h_ratio = 1.f;
             item->h_w_ratio = 1.f;
         }
@@ -440,31 +530,17 @@ add_include(Document_System *doc_system, Document_Builder *builder, String text)
 }
 
 internal void
-add_element_list(Document_Builder *builder, Meta_Unit *unit){
+add_doc_list(Document_Builder *builder, Meta_Unit *unit, Mangle_Rule mangle_rule){
     Document_Item *item = doc_new_item(builder, Doc_DocList);
     item->unit_elements.unit = unit;
+    item->unit_elements.mangle_rule = mangle_rule;
 }
 
 internal void
-add_element_list(Document_Builder *builder, Meta_Unit *unit, Alternate_Names_Array *alt_names, i32 alt_name_type){
-    Document_Item *item = doc_new_item(builder, Doc_DocList);
-    item->unit_elements.unit = unit;
-    item->unit_elements.alt_names = alt_names;
-    item->unit_elements.alt_name_type = alt_name_type;
-}
-
-internal void
-add_full_elements(Document_Builder *builder, Meta_Unit *unit){
+add_doc_full(Document_Builder *builder, Meta_Unit *unit, Mangle_Rule mangle_rule){
     Document_Item *item = doc_new_item(builder, Doc_DocFull);
     item->unit_elements.unit = unit;
-}
-
-internal void
-add_full_elements(Document_Builder *builder, Meta_Unit *unit, Alternate_Names_Array *alt_names, i32 alt_name_type){
-    Document_Item *item = doc_new_item(builder, Doc_DocFull);
-    item->unit_elements.unit = unit;
-    item->unit_elements.alt_names = alt_names;
-    item->unit_elements.alt_name_type = alt_name_type;
+    item->unit_elements.mangle_rule = mangle_rule;
 }
 
 internal void
@@ -500,10 +576,7 @@ add_end_style(Document_Builder *builder){
 
 internal void
 add_document_link(Document_Builder *builder, String text){
-    Document_Item *item = doc_new_item(builder, Doc_BeginStyle);
-    item->string.string = str_alloc(text.size);
-    fm_align();
-    copy(&item->string.string, text);
+    doc_new_item_strings(builder, Doc_DocumentLink, text, null_string);
 }
 
 internal void
@@ -577,6 +650,9 @@ enum Command_Types{
     Cmd_TableOfContents,
     Cmd_Todo,
     Cmd_Include,
+    Cmd_MetaParse,
+    Cmd_DocList,
+    Cmd_DocFull,
     // never below this
     Cmd_COUNT,
 };
@@ -606,6 +682,9 @@ get_enriched_commands(){
         enriched_commands_global_array[Cmd_TableOfContents] = make_lit_string("TABLE_OF_CONTENTS");
         enriched_commands_global_array[Cmd_Todo]            = make_lit_string("TODO");
         enriched_commands_global_array[Cmd_Include]         = make_lit_string("INCLUDE");
+        enriched_commands_global_array[Cmd_MetaParse]       = make_lit_string("META_PARSE");
+        enriched_commands_global_array[Cmd_DocList]         = make_lit_string("DOC_LIST");
+        enriched_commands_global_array[Cmd_DocFull]         = make_lit_string("DOC_FULL");
     }
     return(enriched_commands_global_array);
 }
@@ -867,6 +946,59 @@ make_document_from_text(Document_System *doc_system, char *title, char *name, En
                             }
                         }break;
                         
+                        case Cmd_MetaParse:
+                        {
+                            String name = {0};
+                            String file = {0};
+                            if (extract_command_body(l, &i, &name)){
+                                if (extract_command_body(l, &i, &file)){
+                                    if (!create_meta_unit(doc_system, name, file)){
+                                        char space[512];
+                                        String str = make_fixed_width_string(space);
+                                        append(&str, "parse failed for ");
+                                        append(&str, file);
+                                        add_error(&builder, str);
+                                    }
+                                }
+                                else{
+                                    report_error_missing_body(&builder, command_string);
+                                }
+                            }
+                            else{
+                                report_error_missing_body(&builder, command_string);
+                            }
+                        }break;
+                        
+                        case Cmd_DocList:
+                        case Cmd_DocFull:
+                        {
+                            String name = {0};
+                            if (extract_command_body(l, &i, &name)){
+                                String mangle = {0};
+                                extract_command_body(l, &i, &mangle);
+                                
+                                Abstract_Item *item = get_item_by_name(doc_system->meta_list, name);
+                                if (item != 0){
+                                    u32 mangle_rule = MangleRule_None;
+                                    if (match_part(mangle, "mangle:")){
+                                        String mangle_name = substr_tail(mangle, sizeof("mangle:")-1);
+                                        mangle_name = skip_chop_whitespace(mangle_name);
+                                        mangle_rule = get_mangle_rule(mangle_name);
+                                    }
+                                    
+                                    if (match_index == Cmd_DocList){
+                                        add_doc_list(&builder, item->unit, mangle_rule);
+                                    }
+                                    else{
+                                        add_doc_full(&builder, item->unit, mangle_rule);
+                                    }
+                                }
+                            }
+                            else{
+                                report_error_missing_body(&builder, command_string);
+                            }
+                        }break;
+                        
                         default:
                         {
                             char space[512];
@@ -919,7 +1051,7 @@ get_unresolved_includes(Document_System *doc_system){
 }
 
 internal void
-resolve_all_includes(Document_System *doc_system, char *src_directory){
+resolve_all_includes(Document_System *doc_system){
     for (;doc_system->unresolved_includes.count > 0;){
         Unresolved_Include_Array includes = get_unresolved_includes(doc_system);
         clear_list(&doc_system->unresolved_includes);
@@ -932,7 +1064,7 @@ resolve_all_includes(Document_System *doc_system, char *src_directory){
             if (inc_doc == 0){
                 String source_text = item->include.name;
                 Enriched_Text *text = fm_push_array(Enriched_Text, 1);
-                *text = load_enriched_text(src_directory, source_text.str);
+                *text = load_enriched_text(doc_system->src_dir, source_text.str);
                 inc_doc = make_document_from_text(doc_system, source_text.str, source_text.str, text);
             }
             item->include.document = inc_doc;
@@ -1143,7 +1275,7 @@ output_begin_link(Document_System *doc_system, String *out, String l){
         l.size--;
     }
     append(out, "href='");
-    if (match_part_sc(l, "document:")){
+    if (match_part(l, "document:")){
         String doc_name = substr_tail(l, sizeof("document:")-1);
         Abstract_Item *doc_lookup = get_item_by_name(doc_system->doc_list, doc_name);
         if (doc_lookup){
@@ -1181,7 +1313,7 @@ output_image(Document_System *doc_system, String *out, String l, String l2){
         }
     }
     
-    if (match_part_sc(l, "image:")){
+    if (match_part(l, "image:")){
         String img_name = substr_tail(l, sizeof("image:")-1);
         Abstract_Item *img_lookup = get_item_by_name(doc_system->img_list, img_name);
         
@@ -1210,7 +1342,7 @@ output_image(Document_System *doc_system, String *out, String l, String l2){
 
 internal void
 output_video(String *out, String l){
-    if (match_part_sc(l, "youtube:")){
+    if (match_part(l, "youtube:")){
         i32 pixel_width = HTML_WIDTH;
         i32 pixel_height = (i32)(pixel_width * 0.5625f);
         
@@ -1288,200 +1420,6 @@ output_end_item(String *out){
     append(out, "</li>");
 }
 
-internal void
-write_enriched_text_html(String *out, Enriched_Text *text, Document_System *doc_system,  Section_Counter *section_counter){
-    String source = text->source;
-    
-    append(out, "<div>");
-    
-    for (String line = get_first_double_line(source);
-         line.str;
-         line = get_next_double_line(source, line)){
-        String l = skip_chop_whitespace(line);
-        output_begin_paragraph(out);
-        
-        i32 start = 0, i = 0;
-        for (; i < l.size; ++i){
-            char ch = l.str[i];
-            if (ch == '\\'){
-                output_plain_old_text(out, substr(l, start, i - start));
-                
-                i32 command_start = i + 1;
-                i32 command_end = command_start;
-                for (; command_end < l.size; ++command_end){
-                    if (!char_is_alpha_numeric(l.str[command_end])){
-                        break;
-                    }
-                }
-                
-                if (command_end == command_start){
-                    if (command_end < l.size && l.str[command_end] == '\\'){
-                        ++command_end;
-                    }
-                }
-                
-                String command_string = substr(l, command_start, command_end - command_start);
-                
-                String *enriched_commands = get_enriched_commands();
-                u32 enriched_commands_count = get_enriched_commands_count();
-                
-                i = command_end;
-                
-                i32 match_index = 0;
-                if (!string_set_match(enriched_commands, enriched_commands_count, command_string, &match_index)){
-                    match_index = -1;
-                }
-                
-                switch (match_index){
-                    case Cmd_BackSlash: append(out, "\\"); break;
-                    
-                    case Cmd_BeginStyle:
-                    {
-                        String body_text = {0};
-                        b32 has_body = extract_command_body(l, &i, &body_text);
-                        if (has_body){
-                            output_begin_style(out, body_text);
-                        }
-                        else{
-                            report_error_html_missing_body(out, command_string);
-                        }
-                    }break;
-                    
-                    case Cmd_EndStyle:
-                    {
-                        output_end_style(out);
-                    }break;
-                    
-                    // TODO(allen): upgrade this bs
-                    case Cmd_DocumentLink:
-                    {
-                        String body_text = {0};
-                        b32 has_body = extract_command_body(l, &i, &body_text);
-                        if (has_body){
-                            output_document_link(out, body_text);
-                        }
-                        else{
-                            report_error_html_missing_body(out, command_string);
-                        }
-                    }break;
-                    
-                    case Cmd_BeginList:
-                    {
-                        output_begin_list(out);
-                    }break;
-                    
-                    case Cmd_EndList:
-                    {
-                        output_end_list(out);
-                    }break;
-                    
-                    case Cmd_BeginItem:
-                    {
-                        output_begin_item(out, section_counter);
-                    }break;
-                    
-                    case Cmd_EndItem:
-                    {
-                        output_end_item(out);
-                    }break;
-                    
-                    case Cmd_BeginLink:
-                    {
-                        String body_text = {0};
-                        b32 has_body = extract_command_body(l, &i, &body_text);
-                        if (has_body){
-                            output_begin_link(doc_system, out, body_text);
-                        }
-                        else{
-                            report_error_html_missing_body(out, command_string);
-                        }
-                    }break;
-                    
-                    case Cmd_EndLink:
-                    {
-                        output_end_link(out);
-                    }break;
-                    
-                    case Cmd_Image:
-                    {
-                        String body_text = {0};
-                        b32 has_body = extract_command_body(l, &i, &body_text);
-                        if (has_body){
-                            String size_parameter = {0};
-                            extract_command_body(l, &i, &size_parameter);
-                            output_image(doc_system, out, body_text, size_parameter);
-                        }
-                        else{
-                            report_error_html_missing_body(out, command_string);
-                        }
-                    }break;
-                    
-                    case Cmd_Video:
-                    {
-                        String body_text = {0};
-                        b32 has_body = extract_command_body(l, &i, &body_text);
-                        if (has_body){
-                            output_video(out, body_text);
-                        }
-                        else{
-                            report_error_html_missing_body(out, command_string);
-                        }
-                    }break;
-                    
-                    case Cmd_Section:
-                    {
-                        String body_text = {0};
-                        b32 has_body = extract_command_body(l, &i, &body_text);
-                        if (has_body){
-                            String extra_text = {0};
-                            extract_command_body(l, &i, &extra_text);
-                            output_begin_section(out, section_counter, body_text, extra_text);
-                        }
-                        else{
-                            report_error_html_missing_body(out, command_string);
-                        }
-                    }break;
-                    
-                    case Cmd_EndSection:
-                    {
-                        output_end_section(out, section_counter);
-                    }break;
-                    
-                    case Cmd_Version:
-                    {
-                        append(out, VERSION);
-                    }break;
-                    
-                    case Cmd_TableOfContents:
-                    {
-                        String str = make_lit_string("Cmd_TableOfContents does not work in this system");
-                        output_error(out, str);
-                    }break;
-                    
-                    default:
-                    {
-                        char space[512];
-                        String str = make_fixed_width_string(space);
-                        append(&str, "unrecognized command ");
-                        append(&str, command_string);
-                        output_error(out, str);
-                    }break;
-                }
-                
-                start = i;
-            }
-        }
-        
-        if (start != i){
-            output_plain_old_text(out, substr(l, start, i - start));
-        }
-        
-        output_end_paragraph(out);
-    }
-    
-    append(out, "</div>");
-}
-
 internal void
 print_item_in_list(String *out, String name, char *id_postfix){
     append(out, "<li><a href='#");
@@ -1851,22 +1789,10 @@ print_function_docs(String *out, String name, String doc_string){
 }
 
 internal void
-print_item_html(String *out, Used_Links *used, Item_Node *item, char *id_postfix, char *section, i32 I, Alternate_Name *alt_name, i32 alt_name_type){
+print_item_html(String *out, Used_Links *used, Item_Node *item, char *id_postfix, char *section, i32 I, u32 mangle_rule){
     Temp temp = fm_begin_temp();
     
-    String name = item->name;
-    
-    switch (alt_name_type){
-        case AltName_Macro:
-        {
-            name = alt_name->macro;
-        }break;
-        
-        case AltName_Public_Name:
-        {
-            name = alt_name->public_name;
-        }break;
-    }
+    String name = apply_mangle_rule(item->name, mangle_rule);
     
     /* NOTE(allen):
     Open a div for the whole item.
@@ -2221,31 +2147,13 @@ doc_item_html(Document_Output_System sys, Document_Item *item, b32 head){
             if (head){
                 append(sys.out, "<ul>");
                 
+                Mangle_Rule mangle_rule = item->unit_elements.mangle_rule;
                 Meta_Unit *unit = item->unit_elements.unit;
-                Alternate_Names_Array *alt_names = item->unit_elements.alt_names;
                 i32 count = unit->set.count;
                 
-                switch (item->unit_elements.alt_name_type){
-                    case AltName_Standard:
-                    {
-                        for (i32 i = 0; i < count; ++i){
-                            print_item_in_list(sys.out, unit->set.items[i].name, "_doc");
-                        }
-                    }break;
-                    
-                    case AltName_Macro:
-                    {
-                        for (i32 i = 0; i < count; ++i){
-                            print_item_in_list(sys.out, alt_names->names[i].macro, "_doc");
-                        }
-                    }break;
-                    
-                    case AltName_Public_Name:
-                    {
-                        for (i32 i = 0; i < count; ++i){
-                            print_item_in_list(sys.out, alt_names->names[i].public_name, "_doc");
-                        }
-                    }break;
+                for (i32 i = 0; i < count; ++i){
+                    String name = apply_mangle_rule(unit->set.items[i].name, mangle_rule);
+                    print_item_in_list(sys.out, name, "_doc");
                 }
                 
                 append(sys.out, "</ul>");
@@ -2255,8 +2163,8 @@ doc_item_html(Document_Output_System sys, Document_Item *item, b32 head){
         case Doc_DocFull:
         {
             if (head){
+                Mangle_Rule mangle_rule = item->unit_elements.mangle_rule;
                 Meta_Unit *unit = item->unit_elements.unit;
-                Alternate_Names_Array *alt_names = item->unit_elements.alt_names;
                 i32 count = unit->set.count;
                 
                 char section_space[32];
@@ -2264,17 +2172,9 @@ doc_item_html(Document_Output_System sys, Document_Item *item, b32 head){
                 append_section_number_reduced(&section_str, sys.section_counter, 1);
                 terminate_with_null(&section_str);
                 
-                if (alt_names){
-                    i32 I = 1;
-                    for (i32 i = 0; i < count; ++i, ++I){
-                        print_item_html(sys.out, sys.used_links, &unit->set.items[i], "_doc", section_str.str, I, &alt_names->names[i], item->unit_elements.alt_name_type);
-                    }
-                }
-                else{
-                    i32 I = 1;
-                    for (i32 i = 0; i < count; ++i, ++I){
-                        print_item_html(sys.out, sys.used_links, &unit->set.items[i], "_doc", section_str.str, I, 0, 0);
-                    }
+                i32 I = 1;
+                for (i32 i = 0; i < count; ++i, ++I){
+                    print_item_html(sys.out, sys.used_links, &unit->set.items[i], "_doc", section_str.str, I, mangle_rule);
                 }
             }
         }break;
diff --git a/site/4ed_sitegen.cpp b/site/4ed_sitegen.cpp
index 735d671b..77b9a676 100644
--- a/site/4ed_sitegen.cpp
+++ b/site/4ed_sitegen.cpp
@@ -41,146 +41,10 @@
 // Meta Parse Rules
 //
 
-internal void
-do_html_output(Document_System *doc_system, char *dst_directory, Abstract_Item *doc){
-    String out = make_string_cap(fm__push(10 << 20), 0, 10 << 20);
-    Assert(out.str != 0);
-    
-    char doc_link[256];
-    if (doc_get_link_string(doc, doc_link, sizeof(doc_link))){
-        generate_document_html(&out, doc_system, doc);
-        char *name = fm_str(dst_directory, "/", doc_link);
-        fm_write_file(name, out.str, out.size);
-        out.size = 0;
-    }
-}
-
-// TODO(allen): replace the documentation declaration system with a straight up enriched text system
 internal Abstract_Item*
-generate_4coder_docs(Document_System *doc_system, char *code_directory, char *src_directory){
-    Meta_Unit *custom_types_unit = fm_push_array(Meta_Unit, 1);
-    Meta_Unit *lexer_funcs_unit = fm_push_array(Meta_Unit, 1);
-    Meta_Unit *lexer_types_unit = fm_push_array(Meta_Unit, 1);
-    Meta_Unit *string_unit = fm_push_array(Meta_Unit, 1);
-    Meta_Unit *custom_funcs_unit = fm_push_array(Meta_Unit, 1);
-    
-    Enriched_Text *introduction = fm_push_array(Enriched_Text, 1);
-    Enriched_Text *lexer_introduction = fm_push_array(Enriched_Text, 1);
-    
-    // NOTE(allen): Parse the code.
-    *custom_types_unit = compile_meta_unit(code_directory, "4coder_API/types.h", ExpandArray(meta_keywords));
-    Assert(custom_types_unit->count != 0);
-    
-    *lexer_funcs_unit = compile_meta_unit(code_directory, "4cpp/4cpp_lexer.h", ExpandArray(meta_keywords));
-    Assert(lexer_funcs_unit->count != 0);
-    
-    *lexer_types_unit = compile_meta_unit(code_directory, "4cpp/4cpp_lexer_types.h", ExpandArray(meta_keywords));
-    Assert(lexer_types_unit->count != 0);
-    
-    *string_unit = compile_meta_unit(code_directory, "string/internal_4coder_string.cpp", ExpandArray(meta_keywords));
-    Assert(string_unit->count != 0);
-    
-    *custom_funcs_unit = compile_meta_unit(code_directory, "4ed_api_implementation.cpp", ExpandArray(meta_keywords));
-    Assert(custom_funcs_unit->count != 0);
-    
-    // NOTE(allen): Compute and store variations of the custom function names
-    Alternate_Names_Array *custom_func_names = fm_push_array(Alternate_Names_Array, 1);
-    i32 name_count = custom_funcs_unit->set.count;
-    custom_func_names->names = fm_push_array(Alternate_Name, name_count);
-    memset(custom_func_names->names, 0, sizeof(*custom_func_names->names)*name_count);
-    
-    for (i32 i = 0; i < custom_funcs_unit->set.count; ++i){
-        String name_string = custom_funcs_unit->set.items[i].name;
-        String *macro = &custom_func_names->names[i].macro;
-        String *public_name = &custom_func_names->names[i].public_name;
-        
-        *macro = str_alloc(name_string.size+4);
-        to_upper_ss(macro, name_string);
-        append_ss(macro, make_lit_string("_SIG"));
-        
-        *public_name = str_alloc(name_string.size);
-        to_lower_ss(public_name, name_string);
-        
-        fm_align();
-    }
-    
-    // NOTE(allen): Load enriched text materials
-    *introduction = load_enriched_text(src_directory, "introduction.txt");
-    *lexer_introduction = load_enriched_text(src_directory, "lexer_introduction.txt");
-    
-    // NOTE(allen): Put together the abstract document
-    Document_Builder builder = begin_document_description(doc_system, "4coder API Docs", "custom_docs", true);
-    
-    add_table_of_contents(&builder);
-    
-    begin_section(&builder, "Introduction", "introduction");
-    add_enriched_text(&builder, introduction);
-    end_section(&builder);
-    
-    begin_section(&builder, "4coder Systems", "4coder_systems");
-    add_todo(&builder);
-    end_section(&builder);
-    
-    begin_section(&builder, "Types and Functions", "types_and_functions");
-    {
-        begin_section(&builder, "Function List", 0);
-        add_element_list(&builder, custom_funcs_unit, custom_func_names, AltName_Public_Name);
-        end_section(&builder);
-        begin_section(&builder, "Type List", 0);
-        add_element_list(&builder, custom_types_unit);
-        end_section(&builder);
-        begin_section(&builder, "Function Descriptions", 0);
-        add_full_elements(&builder, custom_funcs_unit, custom_func_names, AltName_Public_Name);
-        end_section(&builder);
-        begin_section(&builder, "Type Descriptions", 0);
-        add_full_elements(&builder, custom_types_unit);
-        end_section(&builder);
-    }
-    end_section(&builder);
-    
-    begin_section(&builder, "String Library", "string_library");
-    {
-        begin_section(&builder, "String Library Intro", 0);
-        add_todo(&builder);
-        end_section(&builder);
-        begin_section(&builder, "String Function List", 0);
-        add_element_list(&builder, string_unit);
-        end_section(&builder);
-        begin_section(&builder, "String Function Descriptions", 0);
-        add_full_elements(&builder, string_unit);
-        end_section(&builder);
-    }
-    end_section(&builder);
-    
-    begin_section(&builder, "Lexer Library", "lexer_library");
-    {
-        begin_section(&builder, "Lexer Intro", 0);
-        add_enriched_text(&builder, lexer_introduction);
-        end_section(&builder);
-        begin_section(&builder, "Lexer Function List", 0);
-        add_element_list(&builder, lexer_funcs_unit);
-        end_section(&builder);
-        begin_section(&builder, "Lexer Type List", 0);
-        add_element_list(&builder, lexer_types_unit);
-        end_section(&builder);
-        begin_section(&builder, "Lexer Function Descriptions", 0);
-        add_full_elements(&builder, lexer_funcs_unit);
-        end_section(&builder);
-        begin_section(&builder, "Lexer Type Descriptions", 0);
-        add_full_elements(&builder, lexer_types_unit);
-        end_section(&builder);
-    }
-    end_section(&builder);
-    
-    end_document_description(&builder);
-    
-    return(builder.doc);
-}
-
-internal Abstract_Item*
-generate_page(Document_System *doc_system, char *code_directory, char *src_directory, char *source_text, char *big_title, char *small_name){
+generate_page(Document_System *doc_system, char *source_text, char *big_title, char *small_name){
     Enriched_Text *home = fm_push_array(Enriched_Text, 1);
-    *home = load_enriched_text(src_directory, source_text);
+    *home = load_enriched_text(doc_system->src_dir, source_text);
     
     Abstract_Item *doc = make_document_from_text(doc_system, big_title, small_name, home);
     if (doc == 0){
@@ -190,15 +54,6 @@ generate_page(Document_System *doc_system, char *code_directory, char *src_direc
     return(doc);
 }
 
-internal String
-push_string(i32 size){
-    String str = {0};
-    str.memory_size = size;
-    str.str = fm_push_array(char, size);
-    fm_align();
-    return(str);
-}
-
 internal void
 do_image_resize(char *src_file, char *dst_file, char *extension, i32 w, i32 h){
     Temp temp = fm_begin_temp();
@@ -223,72 +78,47 @@ internal void
 generate_site(char *code_directory, char *asset_directory, char *src_directory, char *dst_directory){
     fm_clear_folder(dst_directory);
     
-    Document_System doc_system = create_document_system();
+    Document_System doc_system = create_document_system(code_directory, asset_directory, src_directory);
     
-    struct Site_Asset{
-        char *filename;
-        char *extension;
-        char *name;
-        u32 type;
-    };
-    enum Site_Asset_Type{
-        SiteAsset_None,
-        SiteAsset_Generic,
-        SiteAsset_Image,
-    };
+    add_image_description(&doc_system, "4coder_logo_low_green.png", "png", "4coder_logo");
+    add_image_description(&doc_system, "screen_1.png",              "png", "screen_1");
+    add_image_description(&doc_system, "screen_2.png",              "png", "screen_2");
+    add_image_description(&doc_system, "screen_3.png",              "png", "screen_3");
+    add_generic_file     (&doc_system, "4coder_icon.ico",           "ico", "4coder_icon");
     
-    Site_Asset asset_list[] = {
-        {"4coder_logo_low_green.png", "png", "4coder_logo", SiteAsset_Image   },
-        {"screen_1.png",              "png", "screen_1",    SiteAsset_Image   },
-        {"screen_2.png",              "png", "screen_2",    SiteAsset_Image   },
-        {"screen_3.png",              "png", "screen_3",    SiteAsset_Image   },
-        {"4coder_icon.ico",           "ico", "4coder_icon", SiteAsset_Generic },
-    };
-    
-    for (u32 i = 0; i < ArrayCount(asset_list); ++i){
-        Site_Asset *asset = &asset_list[i];
-        char *name = fm_str(asset_directory, "/", asset->filename);
-        switch (asset_list[i].type){
-            case SiteAsset_Generic:
-            {
-                add_generic_file(&doc_system, name, asset->extension, asset->name);
-            }break;
-            
-            case SiteAsset_Image:
-            {
-                add_image_description(&doc_system, name, asset->extension, asset->name);
-            }break;
-            
-            default: InvalidCodePath;
-        }
-    }
-    
-    char *cdir = code_directory;
-    char *sdir = src_directory;
     Document_System *docs = &doc_system;
     
-    generate_4coder_docs(docs, cdir, sdir);
+    // TODO(allen): From the text file get  "Big Title" and        "smallname".
+    generate_page(docs, "home.txt"        , "4coder Home"        , "home"        );
+    generate_page(docs, "docs.txt"        , "4coder API Docs"    , "custom_docs" );
+    generate_page(docs, "feature_list.txt", "4coder Feature List", "features"    );
+    generate_page(docs, "binding_list.txt", "4coder Binding List", "bindings"    );
+    generate_page(docs, "roadmap.txt"     , "4coder Roadmap"     , "roadmap"     );
+    generate_page(docs, "tutorials.txt"   , "4coder Tutorials"   , "tutorials"   );
     
-    // TODO(allen): From the text file get the          "Big Title" and        "smallname".
-    generate_page(docs, cdir, sdir, "home.txt"        , "4coder Home"        , "home"        );
-    generate_page(docs, cdir, sdir, "docs.txt"        , "4coder API Docs"    , "custom_docs_2" );
-    generate_page(docs, cdir, sdir, "feature_list.txt", "4coder Feature List", "features"    );
-    generate_page(docs, cdir, sdir, "binding_list.txt", "4coder Binding List", "bindings"    );
-    generate_page(docs, cdir, sdir, "roadmap.txt"     , "4coder Roadmap"     , "roadmap"     );
-    generate_page(docs, cdir, sdir, "tutorials.txt"   , "4coder Tutorials"   , "tutorials"   );
-    
-    // NOTE(allen): Create a list of the documents we want to generate.
+    // NOTE(allen): Create a list of the primary documents to generate.
     Abstract_Item_Array original_documents = get_abstract_item_array(&doc_system.doc_list);
     
     // NOTE(allen): Cross link all the includes and pull in any non-primary documents.
-    resolve_all_includes(&doc_system, src_directory);
+    resolve_all_includes(&doc_system);
+    
+    // NOTE(allen): Generate the html from the primary documents and publish them.
+    String out = make_string_cap(fm__push(10 << 20), 0, 10 << 20);
+    Assert(out.str != 0);
     
-    // NOTE(allen): Generate the html from the documents and publish them
     Abstract_Item **doc_ptr = original_documents.items;
     for (u32 j = 0; j < original_documents.count; ++j, ++doc_ptr){
         Abstract_Item *doc = *doc_ptr;
         Assert(doc->item_type == ItemType_Document);
-        do_html_output(&doc_system, dst_directory,  doc);
+        
+        char doc_link[256];
+        if (doc_get_link_string(doc, doc_link, sizeof(doc_link))){
+            generate_document_html(&out, &doc_system, doc);
+            
+            char *name = fm_str(dst_directory, "/", doc_link);
+            fm_write_file(name, out.str, out.size);
+            out.size = 0;
+        }
     }
     
     // NOTE(allen): Publish files
diff --git a/site/source_material/docs.txt b/site/source_material/docs.txt
index d9debc3a..e37d6e4b 100644
--- a/site/source_material/docs.txt
+++ b/site/source_material/docs.txt
@@ -22,7 +22,7 @@
 \SECTION{Types and Functions}{types_and_functions}
 
  \SECTION{Function List}
-  \DOC_LIST{custom_funcs}
+  \DOC_LIST{custom_funcs}{mangle:to lower}
  \END_SECTION
 
  \SECTION{Type List}
@@ -30,7 +30,7 @@
  \END_SECTION
 
  \SECTION{Function Descriptions}
-  \DOC_FULL{custom_funcs}
+  \DOC_FULL{custom_funcs}{mangle:to lower}
  \END_SECTION
 
  \SECTION{Type Descriptions}
diff --git a/string/4coder_string_build_num.txt b/string/4coder_string_build_num.txt
index 0a5554c6..ae29c2fb 100644
--- a/string/4coder_string_build_num.txt
+++ b/string/4coder_string_build_num.txt
@@ -1,5 +1,5 @@
 1
 0
-102
+103
 
 
diff --git a/string/4ed_standard_preamble.h b/string/4ed_standard_preamble.h
index b6ae1e23..10790fe7 100644
--- a/string/4ed_standard_preamble.h
+++ b/string/4ed_standard_preamble.h
@@ -1,28 +1,28 @@
-// 4tech_standard_preamble.h
+// 4ed_standard_preamble.h
 #if !defined(FTECH_INTEGERS)
 #define FTECH_INTEGERS
 #include <stdint.h>
-typedef int8_t i8_4tech;
-typedef int16_t i16_4tech;
-typedef int32_t i32_4tech;
-typedef int64_t i64_4tech;
+typedef int8_t i8_4ed;
+typedef int16_t i16_4ed;
+typedef int32_t i32_4ed;
+typedef int64_t i64_4ed;
 
-typedef uint8_t u8_4tech;
-typedef uint16_t u16_4tech;
-typedef uint32_t u32_4tech;
-typedef uint64_t u64_4tech;
+typedef uint8_t u8_4ed;
+typedef uint16_t u16_4ed;
+typedef uint32_t u32_4ed;
+typedef uint64_t u64_4ed;
 
 #if defined(FTECH_32_BIT)
-typedef u32_4tech umem_4tech;
+typedef u32_4ed umem_4ed;
 #else
-typedef u64_4tech umem_4tech;
+typedef u64_4ed umem_4ed;
 #endif
 
-typedef float f32_4tech;
-typedef double f64_4tech;
+typedef float f32_4ed;
+typedef double f64_4ed;
 
-typedef int8_t b8_4tech;
-typedef int32_t b32_4tech;
+typedef int8_t b8_4ed;
+typedef int32_t b32_4ed;
 #endif
 
 #if !defined(Assert)
diff --git a/string/internal_4coder_string.cpp b/string/internal_4coder_string.cpp
index 5758b559..c1344f6c 100644
--- a/string/internal_4coder_string.cpp
+++ b/string/internal_4coder_string.cpp
@@ -19,7 +19,7 @@ internal_4coder_string.cpp - Base file for generating 4coder_string.h
 FSTRING_BEGIN
 // TOP
 
-#include "4tech_standard_preamble.h"
+#include "4ed_standard_preamble.h"
 
 #if !defined(FSTRING_LINK)
 # define FSTRING_LINK static
@@ -393,14 +393,21 @@ match_part_ccl(char *a, char *b, i32_4tech *len)/*
 DOC_PARAM(len, If this call returns non-zero this parameter is used to output the length of b.)
 DOC(This call is similar to a match call, except that it is permitted for a to be longer than b.
 In other words this call returns non-zero if b is a prefix of a.) */{
+    if (a == 0){
+        a = "";
+    }
+    if (b == 0){
+        b = "";
+    }
+    
     i32_4tech i;
     for (i = 0; b[i] != 0; ++i){
         if (a[i] != b[i]){
-            return 0;
+            return(0);
         }
     }
     *len = i;
-    return 1;
+    return(1);
 }
 
 CPP_NAME(match_part)
@@ -409,14 +416,17 @@ match_part_scl(String a, char *b, i32_4tech *len)/*
 DOC_PARAM(len, If this call returns non-zero this parameter is used to output the length of b.)
 DOC(This call is similar to a match call, except that it is permitted for a to be longer than b.
 In other words this call returns non-zero if b is a prefix of a.) */{
+    if (b == 0){
+        b = "";
+    }
     i32_4tech i;
     for (i = 0; b[i] != 0; ++i){
-        if (a.str[i] != b[i] || i == a.size){
-            return 0;
+        if (i == a.size || a.str[i] != b[i]){
+            return(0);
         }
     }
     *len = i;
-    return 1;
+    return(1);
 }
 
 CPP_NAME(match_part)
@@ -457,14 +467,14 @@ match_part_ss(String a, String b)/*
 DOC(This call is similar to a match call, except that it is permitted for a to be longer than b.
 In other words this call returns non-zero if b is a prefix of a.) */{
     if (a.size < b.size){
-        return 0;
+        return(0);
     }
     for (i32_4tech i = 0; i < b.size; ++i){
         if (a.str[i] != b.str[i]){
-            return 0;
+            return(0);
         }
     }
-    return 1;
+    return(1);
 }
 
 CPP_NAME(match_insensitive)