diff --git a/Cantera/src/ODE_integrators.cpp b/Cantera/src/ODE_integrators.cpp
index 177d6d4c2..8aaf4ad8b 100644
--- a/Cantera/src/ODE_integrators.cpp
+++ b/Cantera/src/ODE_integrators.cpp
@@ -1,6 +1,10 @@
 #include "ct_defs.h"
 #include "Integrator.h"
 
+#ifdef NO_SUNDIALS
+#undef HAS_SUNDIALS
+#endif
+
 #ifdef HAS_SUNDIALS
 #include "CVodesIntegrator.cpp"
 #else
diff --git a/tools/src/fixtext.cpp b/tools/src/fixtext.cpp
index eb120aaad..513bd22a1 100644
--- a/tools/src/fixtext.cpp
+++ b/tools/src/fixtext.cpp
@@ -37,4 +37,3 @@ int main() {
         if (cin.eof()) break;
     }
 }
-
diff --git a/winconfig.h b/winconfig.h
index 53f74222d..54b4cd338 100644
--- a/winconfig.h
+++ b/winconfig.h
@@ -1,4 +1,4 @@
-/* ../config.h.  Generated by configure.  */
+/* config.h.  Generated from config.h.in by configure.  */
 //
 //  Run the 'configure' script to generate 'config.h' from this input file.
 //
@@ -8,20 +8,24 @@
 
 //------------------------ Development flags ------------------//
 //
-// These flags turn on or off features that are still in
-// development and are not yet stable.
+// These flags turn on or off features that are still in 
+// development and are not yet stable. 
 
-#undef DEV_EQUIL
+#define DEV_EQUIL  
 
+// Compile in additional debug printing where available.
+// Note, the printing may need to be turned on via a switch.
+// This just compiles in the code.
+/* #undef DEBUG_MODE */
 
 //------------------------ Fortran settings -------------------//
 
 
-// define types doublereal, integer, and ftnlen to match the
+// define types doublereal, integer, and ftnlen to match the 
 // corresponding Fortran data types on your system. The defaults
 // are OK for most systems
 
-typedef  double       doublereal;   // Fortran double precision
+typedef  double       doublereal;   // Fortran double precision 
 typedef  int          integer;      // Fortran integer
 typedef  int          ftnlen;       // Fortran hidden string length type
 
@@ -31,7 +35,7 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 // adding a hidden argement with the length of the string. Some
 // compilers add the hidden length argument immediately after the
 // CHARACTER variable being passed, while others put all of the hidden
-// length arguments at the end of the argument list. Define this if
+// length arguments at the end of the argument list. Define this if 
 // the lengths are at the end of the argument list. This is usually the
 // case for most unix Fortran compilers, but is (by default) false for
 // Visual Fortran under Windows.
@@ -43,10 +47,13 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 #define FTN_TRAILING_UNDERSCORE
 
 
+#define HAS_SUNDIALS 1
+
+
 //-------- LAPACK / BLAS ---------
 
 // Define if you are using LAPACK and BLAS from the Intel Math Kernel
-// Library
+// Library 
 /* #undef HAVE_INTEL_MKL */
 
 #define LAPACK_FTN_STRING_LEN_AT_END
@@ -56,12 +63,11 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 
 //--------- operating system --------------------------------------
 
-// The configure script defines this if the operatiing system is Mac
-// OS X, This used to add some Mac-specific directories to the default
-// data file search path.
 /* #undef DARWIN */
-#define HAS_SSTREAM
-/* #undef HAS_SSTREAM */
+#define HAS_SSTREAM 1
+
+// Cantera version
+#define CANTERA_VERSION "1.7.0"
 
 // Identify whether the operating system is cygwin's overlay of
 // windows, with gcc being used as the compiler.
@@ -69,8 +75,7 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 
 // Identify whether the operating system is windows based, with
 // microsoft vc++ being used as the compiler
-
-#define WINMSVC
+#define WINMSVC 1
 
 #define HAS_SUNDIALS 1
 #define SUNDIALS_VERSION_23
@@ -79,14 +84,32 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 #define RXNPATH_FONT "Helvetica"
 
 //--------------------- Python ------------------------------------
+// This path to the python executable is created during
+// Cantera's setup. It identifies the python executable 
+// used to run Python to process .cti files. Note that this is only
+// used if environment variable PYTHON_CMD is not set.
+#define PYTHON_EXE "/usr/bin/python"
+
 // If this is defined, the Cantera Python interface will use the
 // Numeric package; otherwise, it will use numarray.
-/* #define HAS_NUMERIC 1 */
+/* #undef HAS_NUMERIC */
 
-#define INCL_PURE_FLUIDS 1
+// If this is defined, then python will not be assumed to be
+// present to support conversions
+/* #undef HAS_NO_PYTHON */
 
-//--------------------- compile options ----------------------------
-/* #define USE_PCH 1 */
+#define WITH_HTML_LOGS
+
+// define STORE_MOLE_FRACTIONS if you want Cantera to internally
+// represent the composition of a mixture as mole fractions. Usually
+// the best choice.
+#define STORE_MOLE_FRACTIONS
+
+// define STORE_MASS_FRACTIONS if you want Cantera to internally
+// represent the composition of a mixture as mass fractions. Usually
+// results in slightly worse performance, but may not in all cases.
+//#define STORE_MASS_FRACTIONS
+/* #undef STORE_MASS_FRACTIONS */
 
 #define WITH_METAL
 #define WITH_STOICH_SUBSTANCE