diff --git a/mg/.vimrc.local b/mg/.vimrc.local
new file mode 100755
index 0000000..0b4315c
--- /dev/null
+++ b/mg/.vimrc.local
@@ -0,0 +1,3 @@
+set expandtab
+set path=.,/usr/include,/usr/include/c++/4.4.4,../,../../Isrc,../Isrc,./Isrc
+set tags+=../tags,../../tags
diff --git a/mg/cshrc b/mg/cshrc
index c948cfc..46b702d 100644
--- a/mg/cshrc
+++ b/mg/cshrc
@@ -13,7 +13,7 @@ setenv MGC_SITE `domainname`
 
 switch($MGC_SITE:q)
     case amy.mentorg.com:
-        source /user/icdet/bin/detalias.arm.csh
+        source /wv/icdet/bin/detalias.arm.csh
         setenv MGLS_LICENSE_FILE 1717@amy-lic-01.amy.mentorg.com
         #setenv WG_SERVER /share/ic_wg_server/CACHED_WG_SERVER
         #setenv MGC_SERVER $WG_SERVER
@@ -69,7 +69,8 @@ endif
 
 setenv CALIBRE_PRINT_STACK_TRACE 4242
 #setenv CALIBRE_DUMP_CORE_ON_ABORT 1
-#setenv CALIBRE_DFM_FILL_WRAP_DUMP_COLLECTIONS 1
+setenv CALIBRE_DFM_FILL_WRAP_DUMP_COLLECTIONS 1
+setenv DFM_FILL_WRAP_2D_EXPERIMENTAL 1
 #setenv CALIBRE_MTFLEX_LOCAL_HOST_DIR $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
 #setenv CALIBRE_MTFLEX_LOCAL_HOST_DIR $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
 #setenv TMP $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
@@ -99,6 +100,8 @@ if ( -e /wv/calgrid/sge/default/common/settings.csh ) then
     setenv SGE_ROOT /wv/calgrid/uge811
 endif
 
+setenv CAL_OPTIONS "-turbo -hyper"
+
 #
 #   post-review
 #
diff --git a/mg/setmgchome.csh b/mg/setmgchome.csh
deleted file mode 100644
index e8b00e8..0000000
--- a/mg/setmgchome.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/csh
-
-if ( $1 != '' ) then 
-	set DIR=`readlink -f $1`
-else
-	set DIR=`pwd`
-endif
-
-setenv DWA $DIR
-setenv VVCO $VCO
-
-setenv MGC_HOME $DWA/ic/ic_superproj/$VVCO/Mgc_home
-setenv MGC_BIN $MGC_HOME/bin
-setenv PATH $MGC_BIN\:$PATH
-