diff --git a/Cantera/matlab/setup_winmatlab.py b/Cantera/matlab/setup_winmatlab.py
index 8bba1d530..c7059a23a 100644
--- a/Cantera/matlab/setup_winmatlab.py
+++ b/Cantera/matlab/setup_winmatlab.py
@@ -1,26 +1,35 @@
 
 import sys
 
-bindir = '/usr/local/bin'
-libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.2.0'
-incdir = '/Users/dgg/dv/sf/cantera/build/include'
-libs   = '-lclib  -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx  -lg2c -lgcc'
+bindir = '/home/goodwin/ct153c/bin'
+libdir = '/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu'
+incdir = '/home/goodwin/dv/sf/cantera/build/include'
+dflibdir = ''
+
+libs = ['clib', 'oneD', 'zeroD', 'transport', 'cantera', 'recipes',
+        'cvode', 'ctlapack', 'ctmath', 'ctblas', 'tpx']
 
 f = open('setup.m','w')
-f.write('cd cantera\nbuildux\nexit\n')
+f.write('cd cantera\nbuild_cantera\nexit\n')
 f.close()
 
-fb = open('cantera/buildux.m','w')
+fb = open('cantera/build_cantera.m','w')
 fb.write("""
 disp('building Cantera..');
-mex private/ctmethods.cpp private/ctfunctions.cpp ...
+mex -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ...
     private/xmlmethods.cpp private/phasemethods.cpp  ...
     private/thermomethods.cpp private/kineticsmethods.cpp ...
     private/transportmethods.cpp private/reactormethods.cpp ...
     private/wallmethods.cpp private/flowdevicemethods.cpp ...
     private/onedimmethods.cpp private/surfmethods.cpp private/write.cpp ...
-"""+'-I'+incdir+'     -L'+libdir+' '+libs+'\n'+"""disp('done.');
 """)
+s = ''
+for lib in libs:
+    s += '    '+libdir+'/'+lib+'.lib ...\n'
+fb.write(s)
+fb.write('    "'+dflibdir+'/dformd.lib" ...\n')
+fb.write('    "'+dflibdir+'/dfconsol.lib" ...\n')
+fb.write('    "'+dflibdir+'/dfport.lib" \n')
 fb.close()
 
 fp = open('cantera/ctbin.m','w')
diff --git a/Cantera/src/importCTML.cpp b/Cantera/src/importCTML.cpp
index 701f29ebf..39310256b 100755
--- a/Cantera/src/importCTML.cpp
+++ b/Cantera/src/importCTML.cpp
@@ -280,10 +280,11 @@ namespace Cantera {
 	map<string,string>::const_iterator _b = comp.begin();
 	for (; _b != comp.end(); ++_b) {
 	  if (p.elementIndex(_b->first) < 0) {
-	    if (rule == 0) 
+	    if (rule == 0) {
 		throw CanteraError("installSpecies", 
                     "Species " + s["name"] + 
                     " contains undeclared element " + _b->first);
+	    }
 	    else
 		return false;
 	  }
diff --git a/configure b/configure
index cea7a2b2b..1b3281c9c 100755
--- a/configure
+++ b/configure
@@ -183,7 +183,7 @@ LAPACK_FTN_STRING_LEN_AT_END='y'
 CXX=${CXX:=g++}
 
 # C++ compiler flags
-CXXFLAGS=${CXXFLAGS:="-O3 -Wall"}
+CXXFLAGS=${CXXFLAGS:="-O2 -g -Wall"}
 
 # the C++ flags required for linking
 #LCXX_FLAGS=
@@ -215,7 +215,7 @@ F77=${F77:=g77}
 F90=${F90:=f90}
 
 # Fortran compiler flags
-FFLAGS=${FFLAGS:='-O3'}
+FFLAGS=${FFLAGS:='-O2 -g'}
 
 # the additional Fortran flags required for linking, if any
 #LFORT_FLAGS="-lF77 -lFI77"