diff --git a/config/docs.cfg b/config/docs.cfg
index b08ad3da..0a564526 100644
--- a/config/docs.cfg
+++ b/config/docs.cfg
@@ -1264,6 +1264,8 @@ docident [settex] [Set a texture for the current selection.];
 docargument [T] [position of the texture to set in map cfg] [integer] [0];
 docargument [t] [the type of the texture] [0 (floor), 1 (wall), 2 (ceil), 3 (upper wall)] [0];
 docident [setwpyaw] [takes the current player yaw for the current waypoint];
+docident [showclips] [Show clips/plclips/mapmodel clips in edit mode.];
+docargument [N] [-] [min 0/max 1/default 1];
 docident [showgrid] [Show editing cursor grid.];
 docargument [N] [-] [min 0/max 1/default 1];
 docident [showmip] [Toggles between showing what parts of the scenery are rendered.];
@@ -1699,7 +1701,7 @@ docargument [V] [] [min 0/max 10000/default 75];
 docident [skyclip] [];
 docargument [V] [] [min 0/max 1/default 1];
 docident [spectfov] [Specifies the Field Of View when in spectating/ghost mode.];
-docargument [V] [Spectate FOV size] [min 5/max 120/default 120];
+docargument [V] [Spectate FOV size] [min 5/max 120/default 110];
 docident [stencilbits] [];
 docargument [V] [] [min 0/max 32/default 0];
 docident [stencilshadow] [Sets the transparency/opacity level of stencil shadows.];
diff --git a/config/scripts.cfg b/config/scripts.cfg
index 9e206026..59ff0330 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -411,8 +411,8 @@ switch = [
 ]
 
 // cleanshot - Take a "clean" screenshot with no HUD items.
-const cs_sets [clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun specthudgun showstats showtargetname showgrid]
-const cs_newsets [0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0]
+const cs_sets [clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun specthudgun showstats showtargetname showgrid showclips]
+const cs_newsets [0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0]
 
 const disablehud [ storesets $cs_sets tmp_old_sets; loop csl (listlen $cs_sets) [ (at $cs_sets $csl) (at $cs_newsets $csl) ]; if $editing [ seteditshow 0 ] ]
 const enablehud  [ if (checkalias tmp_old_sets) [ loop ros (listlen $cs_sets) [ (at $cs_sets $ros) (at $tmp_old_sets $ros) ]; if $editing seteditshow ] ]
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index f8fd924a..d61491b0 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -2,6 +2,9 @@
 
 #include "cube.h"
 
+VAR(showclips, 0, 1, 1);
+VAR(showmodelclipping, 0, 0, 1);
+
 vector<entity> ents;
 vector<int> eh_ents; // edithide entities
 const char *entmdlnames[] =
@@ -69,8 +72,6 @@ void rendermapmodels()
     }
 }
 
-VAR(showmodelclipping, 0, 0, 1);
-
 void showedithide()
 {
     loopv(eh_ents)
@@ -219,8 +220,8 @@ void renderentities()
                 defformatstring(path)("pickups/flags/%s", team_basestring(e.attr2));
                 rendermodel(path, ANIM_FLAG|ANIM_LOOP, 0, 0, vec(e.x, e.y, (float)S(e.x, e.y)->floor), (float)((e.attr1+7)-(e.attr1+7)%15), 0, 120.0f);
             }
-            else if((e.type == CLIP || e.type == PLCLIP) && !stenciling) renderclip(e);
-            else if(showmodelclipping && e.type == MAPMODEL && !stenciling)
+            else if((e.type == CLIP || e.type == PLCLIP) && showclips && !stenciling) renderclip(e);
+            else if(e.type == MAPMODEL && showclips && showmodelclipping && !stenciling)
             {
                 mapmodelinfo &mmi = getmminfo(e.attr2);
                 if(&mmi && mmi.h)