diff --git a/Doxyfile b/Doxyfile
index 59a1fa0..77ee554 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -4,8 +4,8 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = ubixos.kdevelop
-PROJECT_NUMBER         = 2.0
-OUTPUT_DIRECTORY       = 
+PROJECT_NUMBER         = 1.0
+OUTPUT_DIRECTORY       = /home/reddawg/source/ubixos/doc
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
@@ -127,7 +127,7 @@
                          *.moc \
                          *.xpm \
                          *.dox
-RECURSIVE              = yes
+RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
@@ -207,7 +207,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
-GENERATE_XML           = yes
+GENERATE_XML           = YES
 XML_OUTPUT             = xml
 XML_SCHEMA             = 
 XML_DTD                = 
diff --git a/src/bin/edit/main.c b/src/bin/edit/main.c
index b76e6b8..1b9a3eb 100644
--- a/src/bin/edit/main.c
+++ b/src/bin/edit/main.c
@@ -32,6 +32,8 @@
 
 int main(int argc,char **argv) {
   FILE *out;
+  int offset;
+  extern char **environ;
   printf("UbixOS Text Editor\n");
   printf("V1.0\n");
 
@@ -40,8 +42,12 @@
   while (!feof(out)) {
     printf("%c",fgetc(out));
     }
- 
-
+  printf("[0x%X:0x%X]\n",environ,offset); 
+  __findenv("term",&offset);
+  printf("[0x%X:0x%X]\n",environ,offset); 
+  putenv("bryce=good");
+  printf("[%s]\n",getenv("bryce"));
+  printf("[0x%X:0x%X]\n",environ,offset); 
   printf("The End\n");
 
   return(0);
diff --git a/src/bin/ld/addlibrary.c b/src/bin/ld/addlibrary.c
index bddd346..07884d6 100644
--- a/src/bin/ld/addlibrary.c
+++ b/src/bin/ld/addlibrary.c
@@ -7,6 +7,7 @@
   int        x        = 0x0;
   int        rel      = 0x0;
   uInt32    *reMap    = 0x0;
+  uInt32    *funcPtr  = 0x0;
   char      *newLoc   = 0x0;
   FILE      *linkerFd = 0x0;
   char       tmpFile[1024];
@@ -149,6 +150,17 @@
       }
     }
   }
+printf("Looking For Environ: [%i]\n\n",tmpLib->linkerSectionHeader[tmpLib->sym].shSize/sizeof(elfDynSym));
+  /* Sync environ __progname */
+    for (i=0x0;i<tmpLib->linkerSectionHeader[tmpLib->sym].shSize/sizeof(elfDynSym);i++) {
+      if (!strcmp("environ",(tmpLib->linkerDynStr + tmpLib->linkerRelSymTab[i].dynName))) {
+        funcPtr = (uInt32 *)((uInt32)(tmpLib->linkerRelSymTab[i].dynValue) + (uInt32)tmpLib->output);
+        *funcPtr = 0x0;
+        printf("[envion:0x%X:0x%X]\n",funcPtr,*funcPtr);
+        //break;
+        }
+      }
+
   if (libs != 0x0)
     libs->prev    = tmpLib;
   tmpLib->prev  = 0x0;
diff --git a/src/bin/ld/findfunc.c b/src/bin/ld/findfunc.c
index 527000c..f68d521 100644
--- a/src/bin/ld/findfunc.c
+++ b/src/bin/ld/findfunc.c
@@ -13,7 +13,7 @@
     if (libPtr == 0x0) {
       libPtr = ldAddLibrary(lib + lib_s[x]);
       }
-  
+
     for (i=0x0;i<libPtr->linkerSectionHeader[libPtr->sym].shSize/sizeof(elfDynSym);i++) {
       if (!strcmp(func,(libPtr->linkerDynStr + libPtr->linkerRelSymTab[i].dynName))) {
         funcPtr = (uInt32 *)((uInt32)(libPtr->linkerRelSymTab[i].dynValue) + (uInt32)libPtr->output);
diff --git a/src/bin/rtld-elf/Makefile b/src/bin/rtld-elf/Makefile
index f8dbd7e..e790378 100644
--- a/src/bin/rtld-elf/Makefile
+++ b/src/bin/rtld-elf/Makefile
@@ -36,13 +36,13 @@
 
 # Compile the source files
 .cpp.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX)  $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 .cc.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX)  $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 .cc.s:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX)  $(CFLAGS) $(INCLUDES) -S -o $@ $<
  
 .c.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
diff --git a/src/lib/csu/crt1.c b/src/lib/csu/crt1.c
index 67fbc1e..5b353b2 100644
--- a/src/lib/csu/crt1.c
+++ b/src/lib/csu/crt1.c
@@ -85,7 +85,7 @@
 	argv = &ap;
 	argc = *(long *)(void *)(argv - 1);
 	env = argv + argc + 1;
-	environ = 0x0;//env;
+	environ = env;
 
 	if (argc > 0 && argv[0] != NULL) {
 		__progname = argv[0];
diff --git a/src/lib/libc/Makefile b/src/lib/libc/Makefile
index 3c25406..1cd8db5 100644
--- a/src/lib/libc/Makefile
+++ b/src/lib/libc/Makefile
@@ -46,7 +46,7 @@
 	(cd gdtoa;make LIBPATH=${LIBPATH})
 	(cd db;make LIBPATH=${LIBPATH})
 	(cd compat-43;make LIBPATH=${LIBPATH})
-	$(CC) -nostdlib -shared -Wl,-x -o $(OUTPUT) -Wl,-soname,$(OUTPUT) `lorder $(OBJS) $(SUBS) | tsort -q`
+	$(CC) -shared -Wl,-x -o $(OUTPUT) -Wl,-soname,$(OUTPUT) `lorder $(OBJS) $(SUBS) | tsort -q`
 	(rm -fr pic.a;ar cq pic.a ./i386/*/*.o ./stdio/*.o ./stdlib/*.o ./string/*.o ./sys/*.o ./xdr/*.o ./yp/*.o ./locale/*.o ./gen/*.o ; ranlib ./pic.a)
 
 pic.a: $(OBJS)
diff --git a/src/lib/libc/libc.inc b/src/lib/libc/libc.inc
index b439490..4cbab92 100644
--- a/src/lib/libc/libc.inc
+++ b/src/lib/libc/libc.inc
@@ -6,7 +6,7 @@
 CFLAGS = -O2 -fno-strict-aliasing -pipe  -D__DBINTERFACE_PRIVATE -DINET6 -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -nostdinc -nostdlib #-fpic -DPIC
 CFLAGS_UTHREAD = -DPIC -O2 -fno-strict-aliasing -pipe  -DPTHREAD_KERNEL -D_LOCK_DEBUG -D_PTHREADS_INVARIANTS
 .else
-CFLAGS = -nostdinc -nostdlib -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DINET6 -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized
+CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DINET6 -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized
 CFLAGS_UTHREAD = -nostdinc -nostdlib -fpic -DPIC -O2 -fno-strict-aliasing -pipe  -DPTHREAD_KERNEL -D_LOCK_DEBUG -D_PTHREADS_INVARIANTS
 .endif
 
diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c
index 8c890a4..d669447 100644
--- a/src/lib/libc/stdlib/getenv.c
+++ b/src/lib/libc/stdlib/getenv.c
@@ -69,8 +69,7 @@
 	char **p, *cp;
 
 /* HACK */
-        *offset = 0xFA;
-        return(0x0);
+        *offset = (int)environ;
 
 	if (name == NULL || environ == NULL)
 		return (NULL);
diff --git a/ubixos.kdevelop b/ubixos.kdevelop
index 7424859..f5dde86 100644
--- a/ubixos.kdevelop
+++ b/ubixos.kdevelop
@@ -3,7 +3,7 @@
   <general>
     <author>Christopher Olsen</author>
     <email>cwolsen@ubixos.com</email>
-    <version>2.0</version>
+    <version>1.0</version>
     <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C</primarylanguage>
     <ignoreparts/>
@@ -15,7 +15,7 @@
     <versioncontrol>kdevcvsservice</versioncontrol>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
   </general>
   <kdevfileview>
     <groups>
@@ -34,27 +34,27 @@
     <envvars/>
     <build>
       <buildtool>make</buildtool>
-      <builddir/>
+      <builddir></builddir>
     </build>
     <make>
       <abortonerror>true</abortonerror>
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin/>
+      <makebin></makebin>
       <environments>
         <default/>
       </environments>
       <prio>0</prio>
-      <defaulttarget/>
-      <makeoptions/>
+      <defaulttarget></defaulttarget>
+      <makeoptions></makeoptions>
       <selectedenvironment>default</selectedenvironment>
     </make>
     <makeenvvars/>
     <run>
       <directoryradio>executable</directoryradio>
       <customdirectory>/</customdirectory>
-      <mainprogram/>
-      <programargs/>
+      <mainprogram></mainprogram>
+      <programargs></programargs>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
       <envvars/>
@@ -115,7 +115,7 @@
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>ubixos.tag</docurl>
-      <usermanualurl/>
+      <usermanualurl></usermanualurl>
     </projectdoc>
   </kdevdocumentation>
   <substmap>
@@ -147,10 +147,10 @@
     <qt>
       <used>false</used>
       <version>3</version>
-      <root/>
+      <root></root>
     </qt>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -190,12 +190,12 @@
   </cppsupportpart>
   <kdevdebugger>
     <general>
-      <programargs/>
-      <gdbpath/>
-      <dbgshell/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
+      <dbgshell></dbgshell>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -211,7 +211,7 @@
     <useglobaltypes/>
   </kdevfilecreate>
   <ctagspart>
-    <customArguments/>
-    <customTagfilePath/>
+    <customArguments></customArguments>
+    <customTagfilePath></customTagfilePath>
   </ctagspart>
 </kdevelop>