diff --git a/Array.c b/Array.c
index 0966710..8728e8e 100644
--- a/Array.c
+++ b/Array.c
@@ -24,7 +24,7 @@
 
 */
 
-#ident "$Id: Array.c,v 1.2 2001/05/20 13:12:02 mario Exp $";
+#ident "$Id: Array.c,v 1.2 2001/05/20 13:12:02 mario Exp $"
 
 #include <stdio.h>
 
diff --git a/Bin2C.c b/Bin2C.c
index bb66c17..23b5d7e 100644
--- a/Bin2C.c
+++ b/Bin2C.c
@@ -24,10 +24,11 @@
 
 */
 
-#ident "$Id: Bin2C.c,v 1.2 2001/05/20 13:12:02 mario Exp $";
+#ident "$Id: Bin2C.c,v 1.2 2001/05/20 13:12:02 mario Exp $"
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/fcntl.h>
 
 int main(int argc, char *argv[])
diff --git a/Diskio.c b/Diskio.c
index be63434..eb0765d 100644
--- a/Diskio.c
+++ b/Diskio.c
@@ -35,7 +35,7 @@
 
 */
 
-#ident "$Id: Diskio.c,v 1.5 2001/06/07 19:57:53 mario Exp $";
+#ident "$Id: Diskio.c,v 1.5 2001/06/07 19:57:53 mario Exp $"
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/Longint.c b/Longint.c
index fe2e88c..79ba311 100644
--- a/Longint.c
+++ b/Longint.c
@@ -32,10 +32,11 @@
 
 */
 
-#ident "$Id: Longint.c,v 1.2 2001/08/01 19:28:13 mario Exp $";
+#ident "$Id: Longint.c,v 1.2 2001/08/01 19:28:13 mario Exp $"
 
 #include <stdio.h>
 #include <assert.h>
+#include <memory.h>
 
 #include "psystem.h"
 #include "pcode.h"
@@ -198,8 +199,7 @@ char is_zero (bc_num num)
 /* In some places we need to check if the number is negative. */
 
 char
-is_neg (num)
-     bc_num num;
+is_neg (bc_num num)
 {
   return num->n_sign == MINUS;
 }
@@ -913,7 +913,8 @@ void LongInt(word EntryPoint)
 
     case 12:			/* Convert LongInt to String */
       {
-	word	StrLen=Pop();
+	// word	StrLen=Pop();
+	(void)Pop();
 	word	StrAddr=Pop();
 	word	IntLen=Pop()-1; /* -1 for sign */
 	word	Sign=Pop();
diff --git a/Makefile b/Makefile
index 6f49d9b..60c0286 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ X11_INCLUDE=$(X11)/include
 X11_LIB=$(X11)/lib
 
 #DEFINES=-DAPPLE_1_3
-DEFINES=-DTURTLEGRAPHICS
+# DEFINES=-DTURTLEGRAPHICS
 
 #IMAGES=ftp://ftp.apple.asimov.net/pub/apple_II/images/utility/programming/apple_pascal
 #IMAGES=ftp://ftp.calvacom.fr/pub/apple_II/images/utility/programming/apple_pascal
@@ -81,10 +81,11 @@ IMAGES=ftp://ftp.mayn.de/pub/mirrors/apple.asimov.net/programming/apple_pascal
 
 INCLUDES=-I$(X11_INCLUDE)
 CFLAGS=-Wall -g $(INCLUDES) $(DEFINES) # -O3 # -Dinline= -pedantic
+CC = clang
 
 MAKEDEPEND=gccmakedep
 
-BINS=ucsd svolio svolcvt xturtleserver
+BINS=ucsd svolio svolcvt # xturtleserver
 all: $(BINS)
 
 install: all
@@ -105,7 +106,11 @@ xturtleserver: xturtleserver.c system.charset.h
 	$(CC) -o $@ -g xturtleserver.c -I$(X11_INCLUDE) -L$(X11_LIB) -R$(X11_LIB) -lXt -lX11 -lm
 
 ucsd: $(OBJS)
-	$(CC) -o $@ $(OBJS) -lncurses_g -lm
+	$(CC) -o $@ $(OBJS) -lcurses -lm
+
+run: ucsd apple_pascal_0.dsk apple_pascal_1.dsk apple_pascal_2.dsk apple_pascal_3.dsk
+	./ucsd -w apple_pascal_0.dsk -w apple_pascal_1.dsk \
+		   -w apple_pascal_2.dsk -w apple_pascal_3.dsk
 
 svolio: svolio.o Diskio.o Memory.o
 	$(CC) -o $@ $+ -lcurses
@@ -131,219 +136,21 @@ apple_pascal: apple_pascal_0.dsk apple_pascal_1.dsk \
 	apple_pascal_2.dsk apple_pascal_3.dsk
 
 apple_pascal_0.dsk:
-	ncftpget $(IMAGES)/$@.gz
+# 	ncftpget $(IMAGES)/$@.gz
 	gzip -d $@.gz
 
 apple_pascal_1.dsk:
-	ncftpget $(IMAGES)/$@.gz
+# 	ncftpget $(IMAGES)/$@.gz
 	gzip -d $@.gz
 
 apple_pascal_2.dsk:
-	ncftpget $(IMAGES)/$@.gz
+# 	ncftpget $(IMAGES)/$@.gz
 	gzip -d $@.gz
 
 apple_pascal_3.dsk:
-	ncftpget $(IMAGES)/$@.gz
+# 	ncftpget $(IMAGES)/$@.gz
 	gzip -d $@.gz
 
 work.svol system.svol: buildimages.sh ucsd apple_pascal_1.dsk \
 	apple_pascal_2.dsk apple_pascal_3.dsk
 	sh buildimages.sh
-
-# DO NOT DELETE
-interpreter.o: interpreter.c /usr/include/assert.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h /usr/include/stdio.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/unistd.h /usr/include/bits/posix_opt.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/string.h \
- /usr/include/setjmp.h /usr/include/bits/setjmp.h /usr/include/math.h \
- /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \
- /usr/include/bits/mathcalls.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/float.h \
- /usr/include/sys/stat.h /usr/include/bits/stat.h \
- /usr/include/sys/time.h /usr/include/bits/time.h /usr/include/fcntl.h \
- /usr/include/bits/fcntl.h version.h psystem.h Memory.h Stack.h Sets.h \
- Array.h Diskio.h Term.h pcode.h
-Memory.o: Memory.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/string.h psystem.h pcode.h Memory.h
-Stack.o: Stack.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/assert.h psystem.h Memory.h Stack.h
-Sets.o: Sets.c psystem.h Sets.h
-Array.o: Array.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h psystem.h \
- Memory.h Array.h
-native6502.o: native6502.c /usr/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h /usr/include/bits/time.h psystem.h pcode.h \
- Memory.h Array.h Term.h
-UnitIo.o: UnitIo.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h psystem.h \
- Memory.h Diskio.h Term.h
-Term.o: Term.c /usr/include/fcntl.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/bits/fcntl.h /usr/include/sys/types.h \
- /usr/include/bits/types.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h \
- /usr/include/stdlib.h /usr/include/alloca.h /usr/include/stdio.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/bits/stdio_lim.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
- /usr/include/getopt.h /usr/include/string.h /usr/include/curses.h \
- /usr/include/unctrl.h /usr/include/term.h /usr/include/termios.h \
- /usr/include/bits/termios.h /usr/include/sys/ttydefaults.h \
- /usr/include/assert.h /usr/include/sys/time.h \
- /usr/include/bits/time.h /usr/include/sys/stat.h \
- /usr/include/bits/stat.h /usr/include/sys/socket.h \
- /usr/include/bits/socket.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/limits.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/bits/posix1_lim.h \
- /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
- /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
- /usr/include/asm/socket.h /usr/include/asm/sockios.h \
- /usr/include/netinet/in.h /usr/include/stdint.h \
- /usr/include/bits/wordsize.h /usr/include/bits/in.h \
- /usr/include/bits/byteswap.h psystem.h Memory.h Term.h
-Diskio.o: Diskio.c /usr/include/unistd.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/types.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/stdio.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/bits/stdio_lim.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/sys/sysmacros.h /usr/include/alloca.h \
- /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \
- /usr/include/string.h /usr/include/sys/stat.h \
- /usr/include/bits/stat.h psystem.h Memory.h Diskio.h
-Printer.o: Printer.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h psystem.h \
- Memory.h
-Search.o: Search.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/string.h psystem.h Memory.h Array.h
-turtlegr.o: turtlegr.c /usr/include/math.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \
- /usr/include/bits/mathcalls.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/float.h \
- /usr/include/unistd.h /usr/include/bits/posix_opt.h \
- /usr/include/bits/types.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/stdio.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/bits/stdio_lim.h /usr/include/sys/types.h \
- /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
- /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h \
- /usr/include/sys/socket.h /usr/include/bits/socket.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/limits.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/bits/posix1_lim.h \
- /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
- /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
- /usr/include/asm/socket.h /usr/include/asm/sockios.h \
- /usr/include/sys/wait.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/bits/siginfo.h psystem.h \
- pcode.h Memory.h Stack.h
-ptrace.o: ptrace.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/string.h ptrace.h
-svolio.o: svolio.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/unistd.h /usr/include/bits/posix_opt.h \
- /usr/include/bits/confname.h /usr/include/getopt.h \
- /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
- psystem.h Memory.h Diskio.h
-svolcvt.o: svolcvt.c /usr/include/stdio.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/unistd.h /usr/include/bits/posix_opt.h \
- /usr/include/bits/confname.h /usr/include/getopt.h
-xturtleserver.o: xturtleserver.c /usr/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stddef.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/stdarg.h \
- /usr/include/bits/types.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/bits/stdio_lim.h \
- /usr/include/math.h /usr/include/bits/huge_val.h \
- /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
- /usr/local/lib/gcc-lib/i686-pc-linux-gnu/2.95.1/include/float.h \
- /opt/X11/include/X11/Intrinsic.h /opt/X11/include/X11/Xlib.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/sys/sysmacros.h /opt/X11/include/X11/X.h \
- /opt/X11/include/X11/Xfuncproto.h /opt/X11/include/X11/Xosdefs.h \
- /opt/X11/include/X11/Xutil.h /opt/X11/include/X11/Xresource.h \
- /usr/include/string.h /opt/X11/include/X11/Core.h \
- /opt/X11/include/X11/Composite.h /opt/X11/include/X11/Constraint.h \
- /opt/X11/include/X11/Object.h /opt/X11/include/X11/RectObj.h \
- /opt/X11/include/X11/StringDefs.h
diff --git a/Memory.c b/Memory.c
index 2907af9..a3792d9 100644
--- a/Memory.c
+++ b/Memory.c
@@ -35,7 +35,7 @@
 
 */
 
-#ident "$Id: Memory.c,v 1.5 2001/06/06 23:26:44 mario Exp $";
+#ident "$Id: Memory.c,v 1.5 2001/06/06 23:26:44 mario Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/Printer.c b/Printer.c
index 0c7c5d8..46b620c 100644
--- a/Printer.c
+++ b/Printer.c
@@ -31,7 +31,7 @@
 
 */
 
-#ident "$Id: Printer.c,v 1.3 2001/06/16 20:25:50 mario Exp $";
+#ident "$Id: Printer.c,v 1.3 2001/06/16 20:25:50 mario Exp $"
 
 #include <stdio.h>
 
diff --git a/Search.c b/Search.c
index 23d4c81..96bf4e5 100644
--- a/Search.c
+++ b/Search.c
@@ -28,7 +28,7 @@
 
 */
 
-#ident "$Id: Search.c,v 1.3 2001/05/26 15:13:29 mario Exp $";
+#ident "$Id: Search.c,v 1.3 2001/05/26 15:13:29 mario Exp $"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Sets.c b/Sets.c
index 8089cda..62a7e3f 100644
--- a/Sets.c
+++ b/Sets.c
@@ -24,7 +24,7 @@
 
 */
 
-#ident "$Id: Sets.c,v 1.2 2001/05/20 13:12:02 mario Exp $";
+#ident "$Id: Sets.c,v 1.2 2001/05/20 13:12:02 mario Exp $"
 
 #include "psystem.h"
 #include "Sets.h"
diff --git a/Stack.c b/Stack.c
index 402acd9..b431131 100644
--- a/Stack.c
+++ b/Stack.c
@@ -24,7 +24,7 @@
 
 */
 
-#ident "$Id: Stack.c,v 1.2 2001/05/20 13:12:02 mario Exp $";
+#ident "$Id: Stack.c,v 1.2 2001/05/20 13:12:02 mario Exp $"
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/Term.c b/Term.c
index 3a3ee07..d5329d3 100644
--- a/Term.c
+++ b/Term.c
@@ -37,7 +37,7 @@
 
 */
 
-#ident "$Id: Term.c,v 1.5 2001/06/07 20:03:10 mario Exp $";
+#ident "$Id: Term.c,v 1.5 2001/06/07 20:03:10 mario Exp $"
 
 #include <fcntl.h>
 #include <stdlib.h>
@@ -294,7 +294,7 @@ int TermStat(void)
 
 static void OpenXTerm(void)
 {
-  int			i;
+  socklen_t	    i;
   int			s;
   struct sockaddr_in	addr;
   char			Buffer[256];
@@ -393,6 +393,9 @@ void TermOpen(int UseXTerm, int BatchFd)
     }
   else
     {
+    #ifndef IUCLC
+    #define IUCLC 0
+    #endif
       tcgetattr(TermOut, &OldTerm);
       NewTerm=OldTerm;
       NewTerm.c_iflag &= ~(PARMRK | ISTRIP | INLCR | IGNCR | 
diff --git a/TreeSearch.c b/TreeSearch.c
index 36ad36e..95f5717 100644
--- a/TreeSearch.c
+++ b/TreeSearch.c
@@ -24,7 +24,7 @@
 
 */
 
-#ident "$Id: TreeSearch.c,v 1.2 2001/05/20 13:12:02 mario Exp $";
+#ident "$Id: TreeSearch.c,v 1.2 2001/05/20 13:12:02 mario Exp $"
 
 #include <stdio.h>
 
diff --git a/UnitIo.c b/UnitIo.c
index 97335a1..ffd3472 100644
--- a/UnitIo.c
+++ b/UnitIo.c
@@ -40,7 +40,7 @@
 
 */
 
-#ident "$Id: UnitIo.c,v 1.7 2001/08/01 19:27:03 mario Exp $";
+#ident "$Id: UnitIo.c,v 1.7 2001/08/01 19:27:03 mario Exp $"
 
 #include <stdio.h>
 
diff --git a/float-conv.c b/float-conv.c
index af0bec7..79728d7 100644
--- a/float-conv.c
+++ b/float-conv.c
@@ -25,7 +25,7 @@
 
 */
 
-#ident "$Id: float-conv.c,v 1.2 2001/05/20 13:12:02 mario Exp $";
+#ident "$Id: float-conv.c,v 1.2 2001/05/20 13:12:02 mario Exp $"
 
 #include <stdio.h>
 
diff --git a/interpreter.c b/interpreter.c
index cf417dc..c128b22 100644
--- a/interpreter.c
+++ b/interpreter.c
@@ -68,7 +68,7 @@
 
 */
 
-#ident "$Id: interpreter.c,v 1.14 2001/06/07 21:18:15 mario Exp $";
+#ident "$Id: interpreter.c,v 1.14 2001/06/07 21:18:15 mario Exp $"
 
 #include <assert.h>
 #include <stdio.h>
@@ -256,7 +256,7 @@ void panic(char *Msg, ...)
 }
 
 /* Convert to boolean. */
-inline word Boolean(word i)
+static inline word Boolean(word i)
 {
   return(i?1:0);
 }
@@ -287,7 +287,7 @@ word FetchB(void)
     return ( (word)b );
 }
 
-inline word FetchW(void)
+static inline word FetchW(void)
 {
   word	w;
   w =  MemRdByte(IpcBase, Ipc++);
@@ -295,7 +295,7 @@ inline word FetchW(void)
   return(w);
 }
 
-inline word FetchUB(void)
+static inline word FetchUB(void)
 {
   return ( (word)MemRdByte(IpcBase, Ipc++) );
 }
@@ -312,20 +312,20 @@ static inline word SelfRelPtr(word Addr)
 }
 
 /* Returns the number of procedures of a segment */
-inline byte SegNumProc(word Seg)
+static inline byte SegNumProc(word Seg)
 {
   return(MemRd(Seg)>>8);
 }
 
 /* Return the segment number of a segment */
-inline byte SegNumber(word Seg)
+static inline byte SegNumber(word Seg)
 {
   return(MemRd(Seg)&0xff);
 }
 
 /* Returns a pointer to the activation record of a specified procedure
    in a specified segment */
-inline word Proc(word Seg, byte ProcNr)
+static inline word Proc(word Seg, byte ProcNr)
 {
   PointerCheck(Seg);
   if ((ProcNr<1) || (ProcNr>SegNumProc(Seg)) )
@@ -334,14 +334,14 @@ inline word Proc(word Seg, byte ProcNr)
 }
 
 /* Returns the procedure number of a procedure */
-inline signed char ProcNumber(word JTab)
+static inline signed char ProcNumber(word JTab)
 {
   PointerCheck(JTab);
   return (MemRd(JTab)&0xff);
 }
 
 /* Returns the lex level of a procedure */
-inline signed char ProcLexLevel(word JTab)
+static inline signed char ProcLexLevel(word JTab)
 {
   PointerCheck(JTab);
   return (MemRd(JTab)>>8);
@@ -355,7 +355,7 @@ static inline word ProcBase(word JTab)
 }
 
 /* Returns the byte offset to the exit code of a procedure. */
-inline word ProcExitIpc(word JTab)
+static inline word ProcExitIpc(word JTab)
 {
   PointerCheck(JTab);
   return (MemRd(WordIndexed(JTab,-1))-
@@ -364,7 +364,7 @@ inline word ProcExitIpc(word JTab)
 
 /* Returns the size of the parameters, which are passed to a
    procedure. */
-inline word ProcParamSize(word JTab)
+static inline word ProcParamSize(word JTab)
 {
   PointerCheck(JTab);
   return (MemRd(WordIndexed(JTab,-3)));
@@ -372,26 +372,26 @@ inline word ProcParamSize(word JTab)
 
 /* Returns the size of the storage a procedure needs for its local
    variables. */
-inline word ProcDataSize(word JTab)
+static inline word ProcDataSize(word JTab)
 {
   PointerCheck(JTab);
   return (MemRd(WordIndexed(JTab,-4)));
 }
 
 /* Returns a pointer to a local variable. */
-inline word LocalAddr(word Offset)
+static inline word LocalAddr(word Offset)
 {
   return(WordIndexed(Mp, MS_VAR+Offset));
 }
 
 /* Returns a pointer to a global variable. */
-inline word GlobalAddr(word Offset)
+static inline word GlobalAddr(word Offset)
 {
   return(WordIndexed(Base,MS_VAR+Offset));
 }
 
 /* Traverse the static link chain. */
-inline word Intermediate(byte Count)
+static inline word Intermediate(byte Count)
 {
   word p;
   for (p=Mp;Count;Count--)
@@ -400,14 +400,14 @@ inline word Intermediate(byte Count)
 }
 
 /* Returns a pointer to a variable of an enclosing procedure. */
-inline word IntermediateAddr(word Offset, byte Count)
+static inline word IntermediateAddr(word Offset, byte Count)
 {
   return( WordIndexed(Intermediate(Count), MS_VAR+Offset) );
 }
 
 /* Returns a pointer to a variable in a data segment (a global
    variable in a UNIT) */
-inline word ExtendedAddr(word Offset, byte SegNo)
+static inline word ExtendedAddr(word Offset, byte SegNo)
 {
   assert(SegNo<NUMBER(SegDict));
   return(WordIndexed(SegDict[SegNo].Seg, Offset));
@@ -431,7 +431,7 @@ word jump(signed char disp)
 }
 
 /* Calculates the static link pointer for a procedure */
-inline word StaticLink(word NewSeg, byte ProcNo)
+static inline word StaticLink(word NewSeg, byte ProcNo)
 {
   word NewJTab=Proc(NewSeg, ProcNo);
 
@@ -690,7 +690,7 @@ void Debugger(void)
   char		prompt[64];
   char		Buffer[256];
   int		from,to;
-  char		Buf[10];
+  char		Buf[12];
   char		*line;
   FILE		*out;
   char		*mode;
@@ -865,7 +865,7 @@ void Debugger(void)
    tries to 'normalize' the value of pointers. Of course, the
    assumtions are not always true, but the diffs get a lot shorter
    using this translation. :-) */
-inline word Translate(word Value)
+static inline word Translate(word Value)
 {
 #ifdef TRACE_TRANSLATE
 #ifdef WORD_MEMORY
@@ -910,9 +910,9 @@ void Tracer(void)
 void SetTrace(char *list)
 {
   int i,j;
-  char *p;
+//  char *p;
 
-  p=strchr(list, ',');
+//  p=strchr(list, ',');
   switch(sscanf(list, "%d,%d", &i, &j))
     {
     case 1:
@@ -1897,7 +1897,8 @@ void Processor(void)
 	      break;
 	    case CSP_SCN:
 	      {
-		word	Dummy  = Pop();
+		// word	Dummy  = Pop();
+		(void)Pop();
 		Integer	Offset = PopInteger();
 		word	Buf    = Pop();		/* Buffer Address */
 		word	ch     = Pop();		/* zu suchendes Zeichen */
diff --git a/native6502.c b/native6502.c
index 2e3a2b2..24d9b77 100644
--- a/native6502.c
+++ b/native6502.c
@@ -35,7 +35,7 @@
 
 */
 
-#ident "$Id: native6502.c,v 1.5 2001/06/10 20:40:04 mario Exp $";
+#ident "$Id: native6502.c,v 1.5 2001/06/10 20:40:04 mario Exp $"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ptrace.c b/ptrace.c
index 4311a25..77b1612 100644
--- a/ptrace.c
+++ b/ptrace.c
@@ -42,7 +42,7 @@
 
 */
 
-#ident "$Id: ptrace.c,v 1.6 2001/06/06 23:00:27 mario Exp $";
+#ident "$Id: ptrace.c,v 1.6 2001/06/06 23:00:27 mario Exp $"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/svolcvt.c b/svolcvt.c
index 3969c86..218bc50 100644
--- a/svolcvt.c
+++ b/svolcvt.c
@@ -28,10 +28,11 @@
 
 */
 
-#ident "$Id: svolcvt.c,v 1.3 2001/05/20 13:51:06 mario Exp $";
+#ident "$Id: svolcvt.c,v 1.3 2001/05/20 13:51:06 mario Exp $"
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 # define SEC_SIZE	256
 # define SEC_PER_TRACK	16
diff --git a/svolio.c b/svolio.c
index 4d5aea3..3917e2e 100644
--- a/svolio.c
+++ b/svolio.c
@@ -38,10 +38,11 @@
 
 */
 
-#ident "$Id: svolio.c,v 1.6 2001/06/07 21:18:15 mario Exp $";
+#ident "$Id: svolio.c,v 1.6 2001/06/07 21:18:15 mario Exp $"
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <getopt.h>
diff --git a/turtlegr.c b/turtlegr.c
index 10a2798..743b908 100644
--- a/turtlegr.c
+++ b/turtlegr.c
@@ -33,12 +33,13 @@
 
 #ifdef TURTLEGRAPHICS
 
-#ident "$Id: turtlegr.c,v 1.4 2001/06/06 23:14:19 mario Exp $";
+#ident "$Id: turtlegr.c,v 1.4 2001/06/06 23:14:19 mario Exp $"
 
 #include <math.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
diff --git a/xturtleserver.c b/xturtleserver.c
index 9c532a5..2a377f5 100644
--- a/xturtleserver.c
+++ b/xturtleserver.c
@@ -28,7 +28,7 @@
 
 */
 
-#ident "$Id: xturtleserver.c,v 1.1 2001/05/23 21:16:41 mario Exp $";
+#ident "$Id: xturtleserver.c,v 1.1 2001/05/23 21:16:41 mario Exp $"
 
 #include <stdio.h>
 #include <math.h>