diff --git a/tools/vmap/bsp.c b/tools/vmap/bsp.c
index 8da2e5f..49b43b3 100644
--- a/tools/vmap/bsp.c
+++ b/tools/vmap/bsp.c
@@ -593,6 +593,7 @@ int BSPMain( int argc, char **argv ){
 	maxSurfaceIndexes = game->maxSurfaceIndexes;
 	texturesRGB = game->texturesRGB;
 	colorsRGB = game->colorsRGB;
+	sampleSize = 16;
 
 	/* process arguments */
 	for ( i = 1; i < ( argc - 1 ); i++ )
diff --git a/tools/vmap/light.c b/tools/vmap/light.c
index 2a12317..4b061e8 100644
--- a/tools/vmap/light.c
+++ b/tools/vmap/light.c
@@ -2460,9 +2460,18 @@ int LightMain( int argc, char **argv ){
 	qboolean lightSamplesInsist = qfalse;
 	qboolean fastAllocate = qfalse;
 
+	/* defaults */
 	fast = qtrue;
 	fastgrid = qtrue;
 	fastbounce = qtrue;
+	bounce = 8;
+	dirty = qtrue;
+	patchShadows = qtrue;
+	deluxemap = qtrue;
+	noStyles = qtrue;
+	sampleSize = 16;
+	shadeAngleDegrees = 40.0f;
+	shade = qtrue;
 
 	/* note it */
 	Sys_Printf( "--- Light ---\n" );
@@ -2934,6 +2943,10 @@ int LightMain( int argc, char **argv ){
 			shade = qtrue;
 			Sys_Printf( "Phong shading enabled\n" );
 		}
+		else if ( !strcmp( argv[ i ], "-noshade" ) ) {
+			shade = qfalse;
+			Sys_Printf( "Phong shading disabled\n" );
+		}
 
 		else if ( !strcmp( argv[ i ], "-bouncegrid" ) ) {
 			bouncegrid = qtrue;
@@ -3047,6 +3060,10 @@ int LightMain( int argc, char **argv ){
 			patchShadows = qtrue;
 			Sys_Printf( "Patch shadow casting enabled\n" );
 		}
+		else if ( !strcmp( argv[ i ], "-nopatchshadows" ) ) {
+			patchShadows = qfalse;
+			Sys_Printf( "Patch shadow casting disabled\n" );
+		}
 		else if ( !strcmp( argv[ i ], "-samplesize" ) ) {
 			sampleSize = atoi( argv[ i + 1 ] );
 			if ( sampleSize < 1 ) {
@@ -3140,6 +3157,10 @@ int LightMain( int argc, char **argv ){
 			dirty = qtrue;
 			Sys_Printf( "Dirtmapping enabled\n" );
 		}
+		else if ( !strcmp( argv[ i ], "-nodirty" ) ) {
+			dirty = qfalse;
+			Sys_Printf( "Dirtmapping disabled\n" );
+		}
 		else if ( !strcmp( argv[ i ], "-dirtdebug" ) || !strcmp( argv[ i ], "-debugdirt" ) ) {
 			dirtDebug = qtrue;
 			Sys_Printf( "Dirtmap debugging enabled\n" );