diff --git a/eo/eo.pc b/eo/eo.pc
deleted file mode 100644
index d15d1081..00000000
--- a/eo/eo.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Package Information for pkg-config
-
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/eo
-
-Name: Evolving Object
-Description: Evolving Object
-Version: 1.02-cvs1
-Libs: -L${libdir} -leoutils -leo -les -lga -lcma -leomoo -lgcov
-Cflags: -I${includedir}
diff --git a/eo/pc.cmake b/eo/pc.cmake
new file mode 100644
index 00000000..ad3c17ef
--- /dev/null
+++ b/eo/pc.cmake
@@ -0,0 +1,6 @@
+# Package Information for pkg-config
+Name: @PACKAGE_NAME@
+Description: @PACKAGE_NAME@
+Version: @PROJECT_VERSION@
+Libs: -L@PCPREFIX@/lib @PCFLAGS@
+Cflags: -I@PCPREFIX@/include/@PCINCLUDEDIR@
diff --git a/eo/src/do/make_pop.h b/eo/src/do/make_pop.h
index 76242cab..191ab065 100644
--- a/eo/src/do/make_pop.h
+++ b/eo/src/do/make_pop.h
@@ -57,17 +57,17 @@ template <class EOT>
 eoPop<EOT>&  do_make_pop(eoParser & _parser, eoState& _state, eoInit<EOT> & _init)
 {
   // random seed
-    eoValueParam<uint32_t>& seedParam = _parser.createParam(uint32_t(0), "seed", "Random number seed", 'S');
+    eoValueParam<uint32_t>& seedParam = _parser.getORcreateParam(uint32_t(0), "seed", "Random number seed", 'S');
     if (seedParam.value() == 0)
 	seedParam.value() = time(0);
-    eoValueParam<unsigned>& popSize = _parser.createParam(unsigned(20), "popSize", "Population Size", 'P', "Evolution Engine");
+    eoValueParam<unsigned>& popSize = _parser.getORcreateParam(unsigned(20), "popSize", "Population Size", 'P', "Evolution Engine");
 
   // Either load or initialize
   // create an empty pop and let the state handle the memory
   eoPop<EOT>& pop = _state.takeOwnership(eoPop<EOT>());
 
-  eoValueParam<std::string>& loadNameParam = _parser.createParam(std::string(""), "Load","A save file to restart from",'L', "Persistence" );
-  eoValueParam<bool> & recomputeFitnessParam = _parser.createParam(false, "recomputeFitness", "Recompute the fitness after re-loading the pop.?", 'r',  "Persistence" );
+  eoValueParam<std::string>& loadNameParam = _parser.getORcreateParam(std::string(""), "Load","A save file to restart from",'L', "Persistence" );
+  eoValueParam<bool> & recomputeFitnessParam = _parser.getORcreateParam(false, "recomputeFitness", "Recompute the fitness after re-loading the pop.?", 'r',  "Persistence" );
 
   if (loadNameParam.value() != "") // something to load
     {