diff --git a/Stage6/Compiler.hs b/Stage6/Compiler.hs
index 05e19ca..6f6fab1 100644
--- a/Stage6/Compiler.hs
+++ b/Stage6/Compiler.hs
@@ -20,10 +20,10 @@ main = do
   inputFile <- openFile (head args) ReadMode
   fileContents <- hGetContents inputFile
   let (tTable, gTable, sp, fDecl, main) = parseTokens (scanTokens fileContents)
-  print gTable
-  print tTable
+  -- print gTable
+  -- print tTable
   -- print fDecl
-  let (_, mainAst) = main in putStr $ prettyPrint mainAst
+  -- let (_, mainAst) = main in putStr $ prettyPrint mainAst
   let code = codeGen gTable sp tTable fDecl main
   createOutputFile code
   hClose inputFile
diff --git a/Stage6/ParserState.hs b/Stage6/ParserState.hs
index 09f7503..4e41794 100644
--- a/Stage6/ParserState.hs
+++ b/Stage6/ParserState.hs
@@ -137,8 +137,8 @@ dotSymCheck symName dots = do
 
 intCheck :: SyntaxTree -> State ParserState SyntaxTree
 intCheck n = do
-  (_, _, _, symTab) <- get
-  if isInteger symTab n then return n else error $ "Integer value was expected on right side of assignment: " ++ show n
+  (tt, _, _, symTab) <- get
+  if isInteger symTab tt n then return n else error $ "Integer value was expected: " ++ show n
 
 symCheck :: (Symbol -> Bool) -> String -> State ParserState ()
 symCheck isSym n = do
diff --git a/Stage6/SyntaxTree.hs b/Stage6/SyntaxTree.hs
index 8869392..9fee330 100644
--- a/Stage6/SyntaxTree.hs
+++ b/Stage6/SyntaxTree.hs
@@ -38,15 +38,14 @@ data SyntaxTree
   deriving (Show)
 
 -- | Returns if a given constructor evaluates to an integer value
-isInteger :: GSymbolTable -> SyntaxTree -> Bool
-isInteger st (LeafVar var Deref) = getSymbolType (st Map.! var) == "int*"
-isInteger st (LeafVar var _) = getSymbolType (st Map.! var) == "int"
-isInteger st (LeafFn name _) = getSymbolType (st Map.! name) == "int"
-isInteger _ LeafValInt {} = True
-isInteger _ NodeArmc {} = True
-isInteger _ _ = False
+isInteger :: GSymbolTable -> TypeTable -> SyntaxTree -> Bool
+isInteger st tt v@(LeafVar _ _) = getVarType st tt v == "int"
+isInteger st _ f@(LeafFn _ _) = getFnType st f == "int"
+isInteger _ _ LeafValInt {} = True
+isInteger _ _ NodeArmc {} = True
+isInteger _ _ _ = False
 
--- Used in ParserState. Takes merged sym table
+-- Used in ParserState. Takes merged sym table. (check lvalue)
 getVarType :: GSymbolTable -> TypeTable -> SyntaxTree -> String
 getVarType st _ (LeafVar var Deref) = init $ getSymbolType (st Map.! var) -- Remove "*" from the end
 getVarType st tt (LeafVar var (Dot dotList)) = resolveDotType tt (getSymbolType (st Map.! var)) dotList
diff --git a/Stage6/Test/arrptr.expl b/Stage6/Test/arrptr.expl
new file mode 100644
index 0000000..6ea9af5
--- /dev/null
+++ b/Stage6/Test/arrptr.expl
@@ -0,0 +1,54 @@
+type
+  dataT {
+		int a;
+		dataT b;
+	}
+endtype
+
+decl
+  dataT arr[5], func(dataT *arg), h;
+enddecl
+
+dataT func(dataT *arg)
+{
+  begin
+		*arg = alloc();
+		h = *arg;
+		h.a = 8;
+		h.b = h;
+		return null;
+  end
+}
+
+int main()
+{
+  decl
+		dataT *ptr, px;
+	enddecl
+
+  begin
+    initialize();
+		arr[0] = alloc();
+		arr[1] = alloc();
+		arr[2] = alloc();
+		arr[3] = alloc();
+		arr[4] = alloc();
+
+		ptr = &arr[1];
+		px = *ptr;
+		px.a = 5;
+		write(px.a);
+    write(func(ptr));
+		px = arr[1];
+		write(px.b.b.b.b.b.a);
+		arr[0] = *ptr;
+		if(arr[0] == arr[1]) then
+			write("equality works");
+		endif;
+		if(arr[0] == "no") then
+			write ("equality no work");
+		endif;
+
+  return 0;
+  end
+}
\ No newline at end of file
diff --git a/Stage6/Test/bst.expl b/Stage6/Test/bst.expl
new file mode 100644
index 0000000..54f7ad5
--- /dev/null
+++ b/Stage6/Test/bst.expl
@@ -0,0 +1,107 @@
+type
+  bst{
+  int a;
+  bst left;
+  bst right;
+  }
+endtype
+
+decl
+  int in,opt;
+  bst insert(bst h, int key);
+  int inOrder(bst h); 
+  int preOrder(bst h);
+  int postOrder(bst h);           
+enddecl
+
+bst insert(bst h, int key)
+{
+
+  begin
+    if (h == null) then
+    h = alloc();
+    h.a = key;
+    h.left = null;
+    h.right = null;
+
+    else if (key < h.a) then
+            h.left  = insert(h.left, key);
+
+         else if (key > h.a) then
+                 h.right = insert(h.right, key);
+              endif;
+          endif;
+    endif;   
+   
+    return h;
+  end
+}
+
+int inOrder(bst h){
+     
+  begin
+    
+  if(h!=null) then
+     
+    in=inOrder(h.left);
+    write(h.a);
+    in=inOrder(h.right);
+  endif;
+  return 1;
+  end
+}
+
+int preOrder(bst h){
+     
+  begin
+    
+  if(h!=null) then
+    write(h.a);
+    in=preOrder(h.left);
+    
+    in=preOrder(h.right);
+  endif;
+  return 1;
+  end
+}
+
+int postOrder(bst h){
+     
+  begin
+    
+  if(h!=null) then
+    
+    in=postOrder(h.left);
+    
+    in=postOrder(h.right);
+    write(h.a);
+  endif;
+  return 1;
+  end
+}
+
+int main()
+{ 
+  decl
+  int val,flag;
+  bst Root;
+  enddecl
+
+  begin
+    val = initialize();
+    Root = null;
+
+    read(val);
+
+    while(val!=0) do
+      Root = insert(Root,val);
+      read(val);
+    endwhile;
+
+    in = inOrder(Root);
+    in = preOrder(Root);
+    in = postOrder(Root);
+  
+  return 9;
+  end
+}
diff --git a/Stage6/Test/euclid2.expl b/Stage6/Test/euclid2.expl
new file mode 100644
index 0000000..b0535aa
--- /dev/null
+++ b/Stage6/Test/euclid2.expl
@@ -0,0 +1,57 @@
+type
+  node
+  {
+    int d;
+    int s;
+    int t;
+  }
+endtype
+
+decl
+  node y,z,gcd(int a,int b);
+enddecl
+
+node gcd(int a,int b)
+{
+  decl
+    int q,r,temp;
+  enddecl
+
+  begin
+    if(b==0) then
+      y.d = a;
+      y.s = 1;
+      y.t = 0;
+    else
+      q = a/b;
+      r = a%b;
+      z = gcd(b,r);
+      temp = z.s;
+      y.s = z.t;
+      y.t = temp - (q*z.t);
+    endif;
+
+  return y;
+  end
+}
+
+int main()
+{
+  decl
+    node res;
+    int a,b,c;
+  enddecl
+
+  begin
+    c = initialize();
+    y = alloc();
+    read(a);
+    read(b);
+    res = gcd(a,b);
+    write(res.d);
+    write(res.s);
+    write(res.t);
+
+  return 0;
+  end
+}
\ No newline at end of file
diff --git a/Stage6/Test/euclidl1.expl b/Stage6/Test/euclidl1.expl
new file mode 100644
index 0000000..f89a7e8
--- /dev/null
+++ b/Stage6/Test/euclidl1.expl
@@ -0,0 +1,101 @@
+type
+  node
+  {
+    int d;
+    int s;
+    int t;
+  }
+  List
+  {
+    int a;
+    int b;
+    node g;
+    List next;
+  }
+endtype
+decl
+  node y,z;
+  List head;
+  int insert(int a,int b,node g);
+  node gcd(int m,int n);
+enddecl
+int insert(int a,int b,node g)
+{
+  decl
+    List p,q;
+    node temp;
+  enddecl
+  begin
+      p=alloc();
+      p.a=a;
+      p.b=b;
+      temp=alloc();
+      temp.d=g.d;
+      temp.s=g.s;
+      temp.t=g.t;
+      p.g=temp;
+      if (head== null) then
+          p.next=null;
+          head=p;
+      else
+          p.next=head;
+          head=p;
+      endif;
+  return 0;
+  end
+}
+
+node gcd(int m,int n){
+
+  decl
+    int q,r,temp;
+  enddecl
+
+  begin
+    if(n==0) then
+        y.d = m;
+        y.s = 1;
+        y.t = 0;
+    else
+        q = m/n;
+        r = m-q*n;
+        z = gcd(n,r);
+        temp = z.s;
+        y.s = z.t;
+        y.t = temp - (q*z.t);
+    endif;
+    temp=insert(m,n,y);
+    return y;
+  end
+}
+
+int main()
+{
+  decl
+    int a,b,c;
+    node res;
+  enddecl
+
+  begin
+    c = initialize();
+    y = alloc();
+    read(a);
+    read(b);
+    head=null;
+    res = gcd(a,b);
+    write(res.d);
+    write(res.s);
+    write(res.t);
+    write("stack");
+    while(head!= null) do
+        write(head.a);
+        write(head.b);
+        write(head.g.d);
+        write(head.g.s);
+        write(head.g.t);
+        head=head.next;
+        write("next");
+    endwhile;
+    return 0;
+  end
+}
\ No newline at end of file
diff --git a/Stage6/Test/linked.expl b/Stage6/Test/linked.expl
new file mode 100644
index 0000000..46e2e7d
--- /dev/null
+++ b/Stage6/Test/linked.expl
@@ -0,0 +1,52 @@
+type
+  List
+  {
+    int data;
+    List next;
+  }
+endtype
+
+decl
+    List head;
+enddecl
+
+int main()
+{
+  decl
+    int length, x;
+    List p, q;
+  enddecl
+
+  begin
+    x = initialize();
+    
+    head=null;
+    read(length); 
+
+    q=head;
+    while (length!=0)  do
+      read(x);
+      p=alloc();
+      p.data=x;
+      p.next=null;
+
+      if (head==null) then
+      head=p;
+      q=p;
+      else
+      q.next=p;
+      q=q.next;
+      endif;
+      
+      length=length-1;
+    endwhile;
+
+    p=head;
+    while(p!=null)  do
+      write(p.data);
+      p=p.next;
+    endwhile;
+
+    return 1;
+  end
+}
diff --git a/Stage6/TypeTable.hs b/Stage6/TypeTable.hs
index 382e0ed..5b73f40 100644
--- a/Stage6/TypeTable.hs
+++ b/Stage6/TypeTable.hs
@@ -28,7 +28,7 @@ areValidTypes tTable = all tCheck
   where
     tCheck "int" = True
     tCheck "str" = True
-    tCheck t = case Map.lookup t tTable of
+    tCheck t = case Map.lookup (if last t == '*' then init t else t) tTable of
       Just _ -> True
       Nothing -> error $ "Type '" ++ t ++ "' not recognized."
 
diff --git a/Stage6/test.expl b/Stage6/test.expl
deleted file mode 100644
index 23dccfd..0000000
--- a/Stage6/test.expl
+++ /dev/null
@@ -1,30 +0,0 @@
-type
-  List
-  {
-    int data;
-    List next;
-  }
-endtype
-
-decl
-    List head;
-		int a[5];
-enddecl
-
-int main()
-{
-  decl
-    int length, x;
-    List p, q;
-  enddecl
-
-  begin
-    p = alloc();
-    free(p);
-    initialize();
-    if(head.next.next == head) then
-		  write(p.next.next.next.data);
-    endif;
-    return 1;
-  end
-}