diff --git a/code/anim/animplay.cpp b/code/anim/animplay.cpp
index a6d9ec4197..92026117eb 100644
--- a/code/anim/animplay.cpp
+++ b/code/anim/animplay.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Anim/AnimPlay.cpp $
- * $Revision: 2.20 $
- * $Date: 2006-06-27 05:07:48 $
+ * $Revision: 2.21 $
+ * $Date: 2006-09-11 06:45:39 $
  * $Author: taylor $
  *
  * C module for playing back anim files
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.20  2006/06/27 05:07:48  taylor
+ * fix various compiler warnings and things that Valgrind complained about
+ *
  * Revision 2.19  2006/03/21 00:27:27  taylor
  * some minor cleanup
  *
@@ -377,7 +380,7 @@ void anim_render_one(int screen_id, anim_instance *ani, float frametime)
 	}	
 }
 
-MONITOR(NumANIPlayed);
+MONITOR(NumANIPlayed)
 
 // Setup an anim_play_struct for passing into anim_play().  Will fill in default values, which you
 // can then change before calling anim_play().
diff --git a/code/debris/debris.cpp b/code/debris/debris.cpp
index 9b932d9f5d..b5e6f653ce 100644
--- a/code/debris/debris.cpp
+++ b/code/debris/debris.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Debris/Debris.cpp $
- * $Revision: 2.27 $
- * $Date: 2006-09-11 06:08:08 $
+ * $Revision: 2.28 $
+ * $Date: 2006-09-11 06:45:39 $
  * $Author: taylor $
  *
  * Code for the pieces of exploding object debris.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.27  2006/09/11 06:08:08  taylor
+ * make Species_info[] and Asteroid_info[] dynamic
+ *
  * Revision 2.26  2006/08/20 00:46:02  taylor
  * an int wrap-around issue could (and was) make debris not have electrical arcs (or lighting or sounds) since it would always fail this check
  *
@@ -452,8 +455,8 @@ void debris_page_in()
 	
 }
 
-MONITOR(NumSmallDebrisRend);
-MONITOR(NumHullDebrisRend);
+MONITOR(NumSmallDebrisRend)
+MONITOR(NumHullDebrisRend)
 
 // ---------------------------------------------------------------------------------------
 // debris_render()
@@ -581,8 +584,8 @@ void debris_process_pre( object *objp, float frame_time)
 {
 }
 
-MONITOR(NumSmallDebris);
-MONITOR(NumHullDebris);
+MONITOR(NumSmallDebris)
+MONITOR(NumHullDebris)
 
 // ---------------------------------------------------------------------------------------
 // debris_process_post()
diff --git a/code/freespace2/freespace.cpp b/code/freespace2/freespace.cpp
index 65098025e9..5a52640ecd 100644
--- a/code/freespace2/freespace.cpp
+++ b/code/freespace2/freespace.cpp
@@ -9,13 +9,19 @@
 
 /*
  * $Logfile: /Freespace2/code/Freespace2/FreeSpace.cpp $
- * $Revision: 2.261 $
- * $Date: 2006-09-11 05:35:51 $
+ * $Revision: 2.262 $
+ * $Date: 2006-09-11 06:45:39 $
  * $Author: taylor $
  *
  * FreeSpace main body
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.261  2006/09/11 05:35:51  taylor
+ * some fixes for the standalone server
+ *  - get init order correct for lcl and std init
+ *  - turn off some cmdlines that are just graphics related when Is_standalone
+ *  - skip radar_mission_init() (may need to rethink that though, it's bound to cause problems)
+ *
  * Revision 2.260  2006/09/08 06:20:14  taylor
  * fix things that strict compiling balked at (from compiling with -ansi and -pedantic)
  *
@@ -3967,11 +3973,11 @@ float Timing_render3 = 0.0f;
 float Timing_flip = 0.0f;
 float Timing_clear = 0.0f;
 
-MONITOR(NumPolysDrawn);
-MONITOR(NumPolys);
-MONITOR(NumVerts);
-MONITOR(BmpUsed);
-MONITOR(BmpNew);
+MONITOR(NumPolysDrawn)
+MONITOR(NumPolys)
+MONITOR(NumVerts)
+MONITOR(BmpUsed)
+MONITOR(BmpNew)
 
 
 int Mem_starttime_phys;
diff --git a/code/globalincs/pstypes.h b/code/globalincs/pstypes.h
index f9cf85917c..2e4cff42e6 100644
--- a/code/globalincs/pstypes.h
+++ b/code/globalincs/pstypes.h
@@ -9,16 +9,19 @@
 
 /*
  * $Logfile: /Freespace2/code/GlobalIncs/PsTypes.h $
- * $Revision: 2.44 $
- * $Date: 2006-08-20 00:51:05 $
+ * $Revision: 2.45 $
+ * $Date: 2006-09-11 06:45:39 $
  * $Author: taylor $
- * $Revision: 2.44 $
- * $Date: 2006-08-20 00:51:05 $
+ * $Revision: 2.45 $
+ * $Date: 2006-09-11 06:45:39 $
  * $Author: taylor $
  *
  * Header file containg global typedefs, constants and macros
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.44  2006/08/20 00:51:05  taylor
+ * maybe optimize the (PI/2), (PI*2) and (RAND_MAX/2) stuff a little bit
+ *
  * Revision 2.43  2006/06/07 03:17:55  wmcoolmon
  * Scripting system prep for 3.6.9
  *
@@ -901,7 +904,7 @@ class monitor {
 };
 
 // Creates a monitor variable
-#define MONITOR(function_name)				monitor mon_##function_name(#function_name)
+#define MONITOR(function_name)				monitor mon_##function_name(#function_name);
 
 // Increments a monitor variable
 #define MONITOR_INC(function_name,inc)		do { mon_##function_name.value+=(inc); } while(0)
diff --git a/code/globalincs/systemvars.cpp b/code/globalincs/systemvars.cpp
index 23cd8bf026..55161c0b0b 100644
--- a/code/globalincs/systemvars.cpp
+++ b/code/globalincs/systemvars.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/GlobalIncs/SystemVars.cpp $
- * $Revision: 2.11 $
- * $Date: 2006-04-20 06:32:01 $
- * $Author: Goober5000 $
+ * $Revision: 2.12 $
+ * $Date: 2006-09-11 06:45:39 $
+ * $Author: taylor $
  *
  * Variables and constants common to FreeSpace and Fred.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.11  2006/04/20 06:32:01  Goober5000
+ * proper capitalization according to Volition
+ *
  * Revision 2.10  2006/01/27 20:29:30  Goober5000
  * some tweaks for insertion sort
  * --Goober5000
@@ -517,7 +520,7 @@ DCF(monitor,"Monitors game performace")
 }
 
 
-MONITOR(FrameRateX100);
+MONITOR(FrameRateX100)
 
 void monitor_update()
 {
diff --git a/code/graphics/font.cpp b/code/graphics/font.cpp
index 1b543152f8..46739506af 100644
--- a/code/graphics/font.cpp
+++ b/code/graphics/font.cpp
@@ -9,13 +9,18 @@
 
 /*
  * $Logfile: /Freespace2/code/Graphics/Font.cpp $
- * $Revision: 2.17 $
- * $Date: 2006-09-11 06:36:38 $
+ * $Revision: 2.18 $
+ * $Date: 2006-09-11 06:45:39 $
  * $Author: taylor $
  *
  * source file for font stuff
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.17  2006/09/11 06:36:38  taylor
+ * clean up the grstub mess (for work on standalone server, and just for sanity sake)
+ * move color and shader functions to 2d.cpp since they are exactly the same everywhere
+ * don't bother with the function pointer for gr_set_font(), it's the same everywhere anyway
+ *
  * Revision 2.16  2006/06/27 05:07:48  taylor
  * fix various compiler warnings and things that Valgrind complained about
  *
@@ -501,7 +506,7 @@ void gr_get_string_size(int *w1, int *h1, char *text, int len)
 }
 
 
-MONITOR( FontChars );	
+MONITOR( FontChars )
 
 
 /*
diff --git a/code/missionui/missionshipchoice.cpp b/code/missionui/missionshipchoice.cpp
index 75a15787e9..74b4d0b13c 100644
--- a/code/missionui/missionshipchoice.cpp
+++ b/code/missionui/missionshipchoice.cpp
@@ -9,13 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/MissionUI/MissionShipChoice.cpp $
- * $Revision: 2.64 $
- * $Date: 2006-08-02 22:31:15 $
- * $Author: Goober5000 $
+ * $Revision: 2.65 $
+ * $Date: 2006-09-11 06:45:39 $
+ * $Author: taylor $
  *
  * C module to allow player ship selection for the mission
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.64  2006/08/02 22:31:15  Goober5000
+ * fix display of ship copy class names in ship loadout screen
+ * --Goober5000
+ *
  * Revision 2.63  2006/06/23 04:57:09  wmcoolmon
  * Remove Assert, should be caught by aforementioned warning
  *
@@ -669,7 +673,7 @@ static int Ss_delta_x, Ss_delta_y;	// used to offset the carried icon to make it
 float ShipSelectScreenShipRot = 0.0f;
 int ShipSelectModelNum = -1;
 
-static matrix ShipScreenOrient = IDENTITY_MATRIX;
+//static matrix ShipScreenOrient = IDENTITY_MATRIX;
 
 //////////////////////////////////////////////////////
 // UI Data structs
@@ -4130,4 +4134,4 @@ void ss_recalc_multiplayer_slots()
 			}
 		}
 	}
-} 
+}
diff --git a/code/model/modelcollide.cpp b/code/model/modelcollide.cpp
index 0d6a5f8494..75e0416c69 100644
--- a/code/model/modelcollide.cpp
+++ b/code/model/modelcollide.cpp
@@ -9,13 +9,18 @@
 
 /*
  * $Logfile: /Freespace2/code/Model/ModelCollide.cpp $
- * $Revision: 2.16 $
- * $Date: 2006-07-06 04:06:04 $
- * $Author: Goober5000 $
+ * $Revision: 2.17 $
+ * $Date: 2006-09-11 06:45:40 $
+ * $Author: taylor $
  *
  * Routines for detecting collisions of models.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.16  2006/07/06 04:06:04  Goober5000
+ * 1) complete (almost) changeover to reorganized texture mapping system
+ * 2) finally fix texture animation; textures now animate at the correct speed
+ * --Goober5000
+ *
  * Revision 2.15  2006/07/04 07:42:48  Goober5000
  * --in preparation for fixing an annoying animated texture bug, reorganize the various texture structs and glow point structs and clarify several parts of the texture code :P
  * --this breaks animated glow maps, and animated regular maps still aren't fixed, but these will be remedied shortly
@@ -1036,7 +1041,7 @@ NoHit:
 
 }
 
-MONITOR(NumFVI);
+MONITOR(NumFVI)
 
 // See model.h for usage.   I don't want to put the
 // usage here because you need to see the #defines and structures
diff --git a/code/model/modelinterp.cpp b/code/model/modelinterp.cpp
index 636a3eb769..915b1561ea 100644
--- a/code/model/modelinterp.cpp
+++ b/code/model/modelinterp.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Model/ModelInterp.cpp $
- * $Revision: 2.167 $
- * $Date: 2006-09-08 06:20:14 $
+ * $Revision: 2.168 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  *	Rendering models, I think.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.167  2006/09/08 06:20:14  taylor
+ * fix things that strict compiling balked at (from compiling with -ansi and -pedantic)
+ *
  * Revision 2.166  2006/07/17 01:12:19  taylor
  * fix some missile autocentering issues
  *  - use MR_AUTOCENTER and MR_IS_MISSILE flags to generate an autocenter for a missile if one doesn't already exist
@@ -3067,10 +3070,10 @@ int Model_polys = 1;
 DCF_BOOL( model_texturing, Model_texturing )
 DCF_BOOL( model_polys, Model_polys )
 
-MONITOR( NumModelsRend );	
-MONITOR( NumHiModelsRend );	
-MONITOR( NumMedModelsRend );	
-MONITOR( NumLowModelsRend );	
+MONITOR( NumModelsRend )
+MONITOR( NumHiModelsRend )
+MONITOR( NumMedModelsRend )
+MONITOR( NumLowModelsRend )
 
 /*
 typedef struct model_cache {
diff --git a/code/object/objcollide.cpp b/code/object/objcollide.cpp
index 2d8e5536cc..87f3c4e006 100644
--- a/code/object/objcollide.cpp
+++ b/code/object/objcollide.cpp
@@ -9,14 +9,17 @@
 
 /*
  * $Logfile: /Freespace2/code/Object/ObjCollide.cpp $
- * $Revision: 2.11 $
- * $Date: 2005-10-17 05:48:18 $
+ * $Revision: 2.12 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  * Helper routines for all the collision detection functions
  * Also keeps track of all the object pairs.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.11  2005/10/17 05:48:18  taylor
+ * dynamically allocate object collision pairs
+ *
  * Revision 2.10  2005/10/09 01:50:04  wmcoolmon
  * Bumped MAX_PAIRS to prevent objects flying through other objects
  *
@@ -719,8 +722,8 @@ void obj_add_pair( object *A, object *B, int check_time, int add_to_end )
 
 }
 
-MONITOR(NumPairs);
-MONITOR(NumPairsChecked);
+MONITOR(NumPairs)
+MONITOR(NumPairsChecked)
 
 extern int Cmdline_dis_collisions;
 void obj_check_all_collisions()
diff --git a/code/object/object.cpp b/code/object/object.cpp
index 361d38b06e..d244afad8f 100644
--- a/code/object/object.cpp
+++ b/code/object/object.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Object/Object.cpp $
- * $Revision: 2.66 $
- * $Date: 2006-08-20 00:47:57 $
+ * $Revision: 2.67 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  * Code to manage objects
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.66  2006/08/20 00:47:57  taylor
+ * very slight speed optimization to avoid math that we really don't need to do anyway
+ *
  * Revision 2.65  2006/07/05 23:35:43  Goober5000
  * cvs comment tweaks
  *
@@ -2032,7 +2035,7 @@ int Collisions_enabled = 1;
 
 DCF_BOOL( collisions, Collisions_enabled )
 
-MONITOR( NumObjects );	
+MONITOR( NumObjects )
 
 //--------------------------------------------------------------------
 //move all objects for the current frame
@@ -2151,7 +2154,7 @@ void obj_move_all(float frametime)
 }
 
 
-MONITOR( NumObjectsRend );	
+MONITOR( NumObjectsRend )
 
 // -----------------------------------------------------------------------------
 //	Render an object.  Calls one of several routines based on type
diff --git a/code/particle/particle.cpp b/code/particle/particle.cpp
index 9b56447012..a86aebe66f 100644
--- a/code/particle/particle.cpp
+++ b/code/particle/particle.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Particle/Particle.cpp $
- * $Revision: 2.20 $
- * $Date: 2006-09-08 06:18:29 $
+ * $Revision: 2.21 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  * Code for particle system
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.20  2006/09/08 06:18:29  taylor
+ * small optimization
+ *
  * Revision 2.19  2006/09/04 06:17:26  wmcoolmon
  * Commit of 'new' BTRL FTL effect work
  *
@@ -470,7 +473,7 @@ void particle_create( vec3d *pos, vec3d *vel, float lifetime, float rad, int typ
 	particle_create(&pinfo);
 }
 
-MONITOR( NumParticles );	
+MONITOR( NumParticles )
 
 void particle_move_all(float frametime)
 {
@@ -528,7 +531,7 @@ void particle_kill_all()
 	Particles.clear();
 }
 
-MONITOR( NumParticlesRend );	
+MONITOR( NumParticlesRend )
 
 void particle_render_all()
 {
diff --git a/code/render/3dmath.cpp b/code/render/3dmath.cpp
index 460d42851b..88e50c112c 100644
--- a/code/render/3dmath.cpp
+++ b/code/render/3dmath.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Render/3dMath.cpp $
- * $Revision: 2.8 $
- * $Date: 2005-04-05 05:53:24 $
+ * $Revision: 2.9 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  * 3d Math routines used by the Renderer lib
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.8  2005/04/05 05:53:24  taylor
+ * s/vector/vec3d/g, better support for different compilers (Jens Granseuer)
+ *
  * Revision 2.7  2005/01/28 11:06:22  Goober5000
  * changed a bunch of transpose-rotate sequences to use unrotate instead
  * --Goober5000
@@ -205,7 +208,7 @@ ubyte g3_transfer_vertex(vertex *dest,vec3d *src)
 }
 
 
-MONITOR( NumRotations );	
+MONITOR( NumRotations )
 
 ubyte g3_rotate_vertex(vertex *dest,vec3d *src)
 {
@@ -459,5 +462,3 @@ float g3_calc_point_depth(vec3d *pnt)
 
 	return q;
 }
-
-
diff --git a/code/ship/shield.cpp b/code/ship/shield.cpp
index 9d00c16629..e77e31a5c8 100644
--- a/code/ship/shield.cpp
+++ b/code/ship/shield.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Ship/Shield.cpp $
- * $Revision: 2.43 $
- * $Date: 2006-09-11 06:08:09 $
+ * $Revision: 2.44 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  *	Stuff pertaining to shield graphical effects, etc.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.43  2006/09/11 06:08:09  taylor
+ * make Species_info[] and Asteroid_info[] dynamic
+ *
  * Revision 2.42  2006/09/04 05:59:47  wmcoolmon
  * Changes to allow for a species with no shield anim
  *
@@ -705,7 +708,7 @@ void render_shield_triangle(gshield_tri *trip, matrix *orient, vec3d *pos, ubyte
 	}
 }
 
-MONITOR(NumShieldRend);
+MONITOR(NumShieldRend)
 
 //	Render a shield mesh in the global array Shield_hits[]
 void render_shield(int shield_num) //, matrix *orient, vec3d *centerp)
@@ -1130,7 +1133,7 @@ void create_shield_explosion(int objnum, int model_num, matrix *orient, vec3d *c
 	// render_shield(orient, centerp);
 }
 
-MONITOR(NumShieldHits);
+MONITOR(NumShieldHits)
 
 //	Add data for a shield hit.
 void add_shield_point(int objnum, int tri_num, vec3d *hit_pos)
diff --git a/code/ship/shiphit.cpp b/code/ship/shiphit.cpp
index a59b40870b..5086dc6e74 100644
--- a/code/ship/shiphit.cpp
+++ b/code/ship/shiphit.cpp
@@ -9,13 +9,16 @@
 
 /*
  * $Logfile: /Freespace2/code/Ship/ShipHit.cpp $
- * $Revision: 2.66 $
- * $Date: 2006-09-04 06:12:16 $
- * $Author: wmcoolmon $
+ * $Revision: 2.67 $
+ * $Date: 2006-09-11 06:45:40 $
+ * $Author: taylor $
  *
  * Code to deal with a ship getting hit by something, be it a missile, dog, or ship.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.66  2006/09/04 06:12:16  wmcoolmon
+ * Conditional hook
+ *
  * Revision 2.65  2006/07/05 23:35:43  Goober5000
  * cvs comment tweaks
  *
@@ -2327,8 +2330,8 @@ void shiphit_hit_after_death(object *ship_obj, float damage)
 	shipp->final_death_time = timestamp(delta_time);	// Adjust time until explosion.
 }
 
-MONITOR( ShipHits );
-MONITOR( ShipNumDied );
+MONITOR( ShipHits )
+MONITOR( ShipNumDied )
 
 int maybe_shockwave_damage_adjust(object *ship_obj, object *other_obj, float *damage)
 {
diff --git a/code/sound/sound.cpp b/code/sound/sound.cpp
index bfb0a64e8b..1270706925 100644
--- a/code/sound/sound.cpp
+++ b/code/sound/sound.cpp
@@ -9,13 +9,18 @@
 
 /*
  * $Logfile: /Freespace2/code/Sound/Sound.cpp $
- * $Revision: 2.35 $
- * $Date: 2006-07-08 18:10:59 $
+ * $Revision: 2.36 $
+ * $Date: 2006-09-11 06:45:40 $
  * $Author: taylor $
  *
  * Low-level sound code
  *
  * $Log: not supported by cvs2svn $
+ * Revision 2.35  2006/07/08 18:10:59  taylor
+ * require OpenAL 1.1 under Windows, I think it's causing problems for us to mix users with 1.0 and builds for 1.1
+ *   (having 1.0 is fatal to sound, but the game should still work, a corresponding Launcher change goes with this too)
+ * clean up some of the error messages to not say "DirectSound" is doing this or that, just say "Audio" instead
+ *
  * Revision 2.34  2006/04/20 06:32:30  Goober5000
  * proper capitalization according to Volition
  *
@@ -893,8 +898,8 @@ int snd_play_raw( int soundnum, float pan, float vol_scale, int priority )
 	return rval;
 }
 
-MONITOR( NumSoundsStarted );
-MONITOR( NumSoundsLoaded );
+MONITOR( NumSoundsStarted )
+MONITOR( NumSoundsLoaded )
 
 // ---------------------------------------------------------------------------------------
 //	snd_play()
@@ -961,8 +966,8 @@ int snd_play( game_snd *gs, float pan, float vol_scale, int priority, bool is_vo
 	return handle;
 }
 
-MONITOR( Num3DSoundsStarted );
-MONITOR( Num3DSoundsLoaded );
+MONITOR( Num3DSoundsStarted )
+MONITOR( Num3DSoundsLoaded )
 
 // ---------------------------------------------------------------------------------------
 // snd_play_3d()
@@ -1475,7 +1480,7 @@ int snd_get_duration(int snd_id)
 }
 
 
-MONITOR( SoundChannels );
+MONITOR( SoundChannels )
 
 // update the position of the listener for the specific 3D sound API we're 
 // using