diff --git a/.gitignore b/.gitignore
index f3828ab..cac6794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,14 @@ docs/JetCore.aux
 docs/JetCore.dvi
 docs/JetCore.log
 docs/JetCore.toc
+
+# jetc build byproducts (compiled JET-to-C++ output, binaries, .so/.a artifacts)
+jetc/jetc
+jetc/demo
+jetc/demo2
+jetc/*.cpp
+jetc/*.pic.o
+jetc/*.so
+jetc/libCoreUtils_pic.a
+!jetc/demo.jet
+!jetc/demo2.jet
diff --git a/TODO.txt b/TODO.txt
index 5b423b0..3873a59 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -9,7 +9,4 @@ file name and content length from variable. $[data(filename)] and
 $[data(length)] possibly.
 4) 
 
-BUG LIST
 
-1) Fix the variable retriever to perform all variable translation
-before fetching value processing.
diff --git a/tests/dump.txt b/tests/dump.txt
index 056dde7..411bcbe 100644
--- a/tests/dump.txt
+++ b/tests/dump.txt
@@ -1,8 +1,30 @@
 *** CGI VARIABLES ***
 *** GLOBAL VARIABLES ***
+=[xxx]
+addition=[8]
+complete=[ABCD;tohex]
+division=[1.666666666667]
+divisor=[8]
+error=[64]
+exprnumbers=[0123456789]
+include=[yes]
+ix=[1]
+lefty=[01234]
+modified1=[ABCD]
+multiplication=[15]
+nested=[64]
+newname=[another container value]
+noeval=[this is the value store in $[%name1].]
+numbers=[0123456789]
+subtraction=[2]
+theexpr=[bcd]
+thename=[this is the value store in .]
+tohex=[tohex]
+varname1=[vardata]
 *** LOCAL VARIABLES ***
+localvar=[This is a container set with '']
+testinclude=[xThis is a container set with ''x]
 *** KEYWORD VALUES ***
-cgi=[yes]
-sessiondir=[.]
+file=[./testinclude.jet]
+name1=[]
 *** COOKIES ***
-session=[18fd56a83f]
diff --git a/tests/testjet.jet b/tests/testjet.jet
index d8f8bc7..a03d06a 100755
--- a/tests/testjet.jet
+++ b/tests/testjet.jet
@@ -1,5 +1,5 @@
 #!../jet-2.0
-<jet cgi="true" name1="localname" filterblanklines="true" trimlines="true">
+<jet cgi="yes" name1="localname" filterblanklines="true" trimlines="true">
  <header name="Content-Type" value="text/html" />
  <comment>This is a comment and should not show up in the output.</comment>
  <html>