diff --git a/cf b/cf
index 49aa6f607..f8b820b97 100644
--- a/cf
+++ b/cf
@@ -111,14 +111,12 @@ FLAGS="$FLAGS --enable-logging"
 #FLAGS="$FLAGS --enable-mmap"
 #FLAGS="$FLAGS --with-udunits"
 #FLAGS="$FLAGS --with-libcf"
-#valgrind => not shared
-#FLAGS="$FLAGS --enable-valgrind-tests"
 #FLAGS="$FLAGS --enable-jna"
 #FLAGS="$FLAGS --disable-properties-attribute"
 #FLAGS="$FLAGS --disable-silent-rules"
 #FLAGS="$FLAGS --with-testservers=remotestserver.localhost:8083"
-FLAGS="$FLAGS --disable-filter-testing"
-#FLAGS="$FLAGS --enable-metadata-perf"
+#FLAGS="$FLAGS --disable-filter-testing"
+FLAGS="$FLAGS --enable-metadata-perf"
 
 if test "x$PAR4" != x1 ; then
 FLAGS="$FLAGS --disable-parallel4"
diff --git a/cf.cmake b/cf.cmake
index 9a3359db1..a52ae9cfd 100644
--- a/cf.cmake
+++ b/cf.cmake
@@ -36,19 +36,32 @@ FLAGS="-DCMAKE_PREFIX_PATH=c:/tools/nccmake"
 fi
 FLAGS="$FLAGS -DCMAKE_INSTALL_PREFIX=/tmp/netcdf"
 
-if test "x$DAP" = x ; then FLAGS="$FLAGS -DENABLE_DAP=false"; fi
-if test "x$NC4" = x ; then FLAGS="$FLAGS -DENABLE_NETCDF_4=false"; fi
-if test "x$CDF5" != x ; then FLAGS="$FLAGS -DENABLE_CDF5=true"; fi
-if test "x$HDF4" != x ; then FLAGS="$FLAGS -DENABLE_HDF4=true"; fi
-FLAGS="$FLAGS -DENABLE_CONVERSION_WARNINGS=false"
+if test "x$DAP" = x ; then
+FLAGS="$FLAGS -DENABLE_DAP=false"
+fi
+if test "x$NC4" = x ; then
+FLAGS="$FLAGS -DENABLE_NETCDF_4=false"
+fi
+if test "x$CDF5" != x ; then
+FLAGS="$FLAGS -DENABLE_CDF5=true"
+fi
+if test "x$HDF4" != x ; then
+FLAGS="$FLAGS -DENABLE_HDF4=true"
+fi
+
+# Enables
 FLAGS="$FLAGS -DENABLE_DAP_REMOTE_TESTS=true"
-FLAGS="$FLAGS -DENABLE_TESTS=true"
-FLAGS="$FLAGS -DENABLE_EXAMPLES=false"
-FLAGS="$FLAGS -DENABLE_DYNAMIC_LOADING=false"
-FLAGS="$FLAGS -DENABLE_WINSOCK2=false"
+FLAGS="$FLAGS -DENABLE_LOGGING=true"
+#FLAGS="$FLAGS -DENABLE_DOXYGEN=true -DENABLE_INTERNAL_DOCS=true"
 #FLAGS="$FLAGS -DENABLE_LARGE_FILE_TESTS=true"
 #FLAGS="$FLAGS -DENABLE_FILTER_TESTING=true"
 
+# Disables
+FLAGS="$FLAGS -DENABLE_EXAMPLES=false"
+FLAGS="$FLAGS -DENABLE_CONVERSION_WARNINGS=false"
+#FLAGS="$FLAGS -DENABLE_TESTS=false"
+#FLAGS="$FLAGS -DENABLE_DISKLESS=false"
+
 rm -fr build
 mkdir build
 cd build
@@ -56,13 +69,16 @@ cd build
 NCLIB=`pwd`
 
 if test "x$VS" != x ; then
+
 # Visual Studio
 CFG="Release"
 NCLIB="${NCLIB}/liblib"
 export PATH="${NCLIB}:${PATH}"
 #G=
 cmake "$G" -DCMAKE_BUILD_TYPE=${CFG} $FLAGS ..
-if test "x$NOBUILD" = x ; then
+if test "x$NOBUILD" = x 
+fi
+
 cmake --build . --config ${CFG}
 cmake --build . --config ${CFG} --target RUN_TESTS
 fi
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 5e034676d..44ce86b8a 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -74,15 +74,16 @@ IF(ENABLE_DOXYGEN)
 
 ENDIF(ENABLE_DOXYGEN)
 
+# Should match list in Makefile.am
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST}
-netcdf.m4 DoxygenLayout.xml Doxyfile.in footer.html	
-mainpage.dox tutorial.dox guide.dox types.dox cdl.dox			
-architecture.dox internal.dox windows-binaries.md			
-building-with-cmake.md CMakeLists.txt groups.dox install.md notes.md	
-install-fortran.md all-error-codes.md credits.md auth.md		
-obsolete/fan_utils.html bestpractices.md filters.md inmemory.md         
-DAP4.dox OPeNDAP.dox attribute_conventions.md FAQ.md                    
-file_format_specifications.md known_problems.md        
+netcdf.m4 DoxygenLayout.xml Doxyfile.in footer.html
+mainpage.dox tutorial.dox guide.dox types.dox cdl.dox
+architecture.dox internal.dox windows-binaries.md
+building-with-cmake.md CMakeLists.txt groups.dox install.md notes.md
+install-fortran.md all-error-codes.md credits.md auth.md
+obsolete/fan_utils.html bestpractices.md filters.md indexing.md
+inmemory.md DAP4.dox OPeNDAP.dox attribute_conventions.md FAQ.md
+file_format_specifications.md known_problems.md
 COPYRIGHT.dox)
 
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 58d09df32..a1934377d 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,8 +9,8 @@ mainpage.dox tutorial.dox guide.dox types.dox cdl.dox			\
 architecture.dox internal.dox windows-binaries.md			\
 building-with-cmake.md CMakeLists.txt groups.dox install.md notes.md	\
 install-fortran.md all-error-codes.md credits.md auth.md		\
-obsolete/fan_utils.html bestpractices.md filters.md inmemory.md         \
-DAP4.dox OPeNDAP.dox attribute_conventions.md FAQ.md                    \
+obsolete/fan_utils.html bestpractices.md filters.md indexing.md         \
+inmemory.md DAP4.dox OPeNDAP.dox attribute_conventions.md FAQ.md        \
 file_format_specifications.md known_problems.md                         \
 COPYRIGHT.dox
 
diff --git a/nc_test/Makefile.am b/nc_test/Makefile.am
index 26ff80d6d..680b9f621 100644
--- a/nc_test/Makefile.am
+++ b/nc_test/Makefile.am
@@ -86,10 +86,12 @@ endif
 # Distribute the .c files so that m4 isn't required on the users
 # machine.
 
-EXTRA_DIST = test_get.m4 test_put.m4 run_valgrind_tests.sh		\
-run_diskless.sh run_diskless2.sh run_diskless5.sh run_mmap.sh		\
-run_pnetcdf_test.sh test_read.m4 test_write.m4 ref_tst_diskless2.cdl	\
-tst_diskless5.cdl run_inmemory.sh CMakeLists.txt
+# Distribute the .c files so that m4 isn't required on the users
+# machine.
+EXTRA_DIST = test_get.m4 test_put.m4 run_diskless.sh run_diskless2.sh   \
+run_diskless5.sh run_mmap.sh run_pnetcdf_test.sh test_read.m4           \
+test_write.m4 ref_tst_diskless2.cdl tst_diskless5.cdl run_inmemory.sh   \
+CMakeLists.txt
 
 # These files are created by the tests.
 CLEANFILES = nc_test_classic.nc nc_test_64bit.nc nc_test_netcdf4.nc     \