diff --git a/bootstrap b/bootstrap
index cddeea5..39f2d08 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,21 @@
 
 # bootstrap the build when checking out from CVS
 
-aclocal
-autoheader
-automake --foreign --add-missing --copy
-autoconf
+if [ "$1" == "clean" ]; then
+	# clean up junk
+	
+	if [ -f Makefile ]; then 
+		make distclean
+	fi
+	find . -name Makefile.in -print0 | xargs -0 rm -f
+	rm -f config.h.in aclocal.m4 install-sh missing mkinstalldirs \
+	      stamp-h.in tags configure
+
+else
+
+	aclocal
+	autoheader
+	automake --foreign --add-missing --copy
+	autoconf
+
+fi
diff --git a/game/Makefile.am b/game/Makefile.am
index 2e47d49..bcbc527 100644
--- a/game/Makefile.am
+++ b/game/Makefile.am
@@ -1,3 +1,4 @@
 # $Id$
 
-SUBDIRS = baseq2 ctf
+#SUBDIRS = baseq2 ctf
+SUBDIRS = baseq2 ctf xatrix rogue
diff --git a/game/baseq2/Makefile.am b/game/baseq2/Makefile.am
index 0b9caab..900b3c7 100644
--- a/game/baseq2/Makefile.am
+++ b/game/baseq2/Makefile.am
@@ -52,6 +52,6 @@ game_so_SOURCES = g_ai.c \
 			q_shared.c \
 			m_flash.c
 
-AM_CFLAGS = -fPIC
+AM_CFLAGS = -fPIC -Wall -Werror -pipe
 AM_CPPFLAGS = -I../../src -I..
 LDFLAGS = -shared
diff --git a/game/ctf/Makefile.am b/game/ctf/Makefile.am
index 19e1a01..18c7046 100644
--- a/game/ctf/Makefile.am
+++ b/game/ctf/Makefile.am
@@ -1,10 +1,5 @@
 # $Id$
 
-
-#############################################################################
-# CTF
-#############################################################################
-
 bin_PROGRAMS = game.so
 game_so_SOURCES = \
 			g_ai.c \
@@ -34,6 +29,6 @@ game_so_SOURCES = \
 			p_weapon.c \
 			q_shared.c
 
-AM_CFLAGS = -fPIC
-AM_CPPFLAGS = -I../../src -I..
+AM_CFLAGS = -fPIC -Wall -Werror -pipe
+AM_CPPFLAGS = -I../../src -I.. -Dstricmp=strcasecmp
 LDFLAGS = -shared
diff --git a/game/game.h b/game/game.h
index ac3f5cc..61a4943 100644
--- a/game/game.h
+++ b/game/game.h
@@ -34,12 +34,17 @@
 #define	SVF_NOCLIENT			0x00000001	// don't send entity to clients, even if it has effects
 #define	SVF_DEADMONSTER			0x00000002	// treat as CONTENTS_DEADMONSTER for collision
 #define	SVF_MONSTER				0x00000004	// treat as CONTENTS_MONSTER for collision
-/* ZOID
+//ROGUE -- added for things that are damageable, but not monsters
+// right now, only the tesla has this
+#define SVF_DAMAGEABLE			0x00000008
+//ROGUE end
+// ZOID
 #define SVF_PROJECTILE			0x00000008  // entity is a simple projectile, used for network optimisation
-if an entity is projectile, the model index/x/y/z/pitch/yaw are sent, encoded into
-seven (or eight) bytes.  This is to speed up projectiles.  Currently, only the
-hyperblaster makes use of this.  use for items that are moving with a constant
-velocity that don't change direction or model
+/* ZOID
+if an entity is projectile, the model index/x/y/z/pitch/yaw are sent, encoded
+into seven (or eight) bytes.  This is to speed up projectiles.  Currently,
+only the hyperblaster makes use of this.  use for items that are moving with
+a constant velocity that don't change direction or model
 ZOID */
 
 // edict->solid values
@@ -116,17 +121,10 @@ struct edict_s
 typedef struct
 {
 	// special messages
-#if 0
-	void	(*bprintf) (int printlevel, char *fmt, ...) __attribute__((format(printf,2,3)));
-	void	(*dprintf) (char *fmt, ...) __attribute__((format(printf,1,2)));
-	void	(*cprintf) (edict_t *ent, int printlevel, char *fmt, ...) __attribute__((format(printf,3,4)));
-	void	(*centerprintf) (edict_t *ent, char *fmt, ...) __attribute__((format(printf,2,3)));
-#else
 	void	(*bprintf) (int printlevel, char *fmt, ...);
 	void	(*dprintf) (char *fmt, ...);
 	void	(*cprintf) (edict_t *ent, int printlevel, char *fmt, ...);
 	void	(*centerprintf) (edict_t *ent, char *fmt, ...);
-#endif
 	void	(*sound) (edict_t *ent, int channel, int soundindex, float volume, float attenuation, float timeofs);
 	void	(*positioned_sound) (vec3_t origin, edict_t *ent, int channel, int soundinedex, float volume, float attenuation, float timeofs);
 
@@ -137,7 +135,7 @@ typedef struct
 	void	(*configstring) (int num, char *string);
 
 	//void	(*error) (char *fmt, ...) __attribute__((noreturn, format(printf,1,2)));
-	void	(*error) (char *fmt, ...) __attribute__((noreturn));
+	void (*error)(char *fmt, ...) __attribute__((noreturn));
 
 	// the *index functions create configstrings and some internal server state
 	int		(*modelindex) (char *name);
diff --git a/game/rogue/Makefile.am b/game/rogue/Makefile.am
index 9ec02d5..90c3213 100644
--- a/game/rogue/Makefile.am
+++ b/game/rogue/Makefile.am
@@ -65,6 +65,6 @@ game_so_SOURCES = \
 			p_weapon.c \
 			q_shared.c
 
-AM_CFLAGS = -fPIC
+AM_CFLAGS = -fPIC -Wall -Werror -pipe
 AM_CPPFLAGS = -I../../src -I..
 LDFLAGS = -shared
diff --git a/game/xatrix/Makefile.am b/game/xatrix/Makefile.am
index 9b03ef7..b7a75c9 100644
--- a/game/xatrix/Makefile.am
+++ b/game/xatrix/Makefile.am
@@ -55,6 +55,6 @@ game_so_SOURCES = \
 			p_weapon.c \
 			q_shared.c
 
-AM_CFLAGS = -fPIC
-AM_CPPFLAGS = -I../../src -I..
+AM_CFLAGS = -fPIC -Wall -Werror -pipe
+AM_CPPFLAGS = -I../../src -I.. -Dstricmp=strcasecmp
 LDFLAGS = -shared