diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25b1c47d7d..fb9418ed11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
 
 option(USE_PNG_BITMAPS "use PNG bitmaps instead of XPM (default ON)" ON)
 
-option(USE_NEW_PCBNEW_LOAD "use new plugin support for legacy file format" OFF)
-option(USE_NEW_PCBNEW_SAVE "use new plugin support for legacy file format" OFF)
+option(USE_NEW_PCBNEW_LOAD "use new plugin support for legacy file format" ON)
+option(USE_NEW_PCBNEW_SAVE "use new plugin support for legacy file format" ON)
 option(USE_PCBNEW_NANOMETRES
        "Use nanometers for Pcbnew internal units instead of deci-mils (default OFF).")
 
diff --git a/TODO.txt b/TODO.txt
index 11f66c9023..bf0d3a2f05 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -52,7 +52,7 @@ PCBNew
   See the @todos in class_zone.cpp
 
 
-Dick's Peronal TODO Items  (Last Update: 20-Feb-2012)
+Dick's Peronal TODO Items  (Last Update: 5-April-2012)
 -----------------------------------------------------
 0)  Check that the new load visibility BOARD settings is properly setting the toolbar
     buttons like show grid or ratsnest.  Add PCB_EDIT_FRAME::SetVisibleElements() so
@@ -60,8 +60,9 @@ Dick's Peronal TODO Items  (Last Update: 20-Feb-2012)
 
 1) Finish removing global access requirements from KICAD_PLUGIN, so that:
    *)   a BOARD is a fully self contained document description.
-   *)   plugin developers do not have to access globals, which assumes there were ever
-        only be one BOARD in RAM.  Problems remain with BASE_SCREEN
+   *)   plugin developers do not have to access globals, since a plugin could
+        very well be a dynamically loaded DLL/DSO.
+        A problem remain with BASE_SCREEN
 
 2) Extend PLUGIN API to facillitate loading and saving of modules.
 
@@ -69,7 +70,7 @@ Dick's Peronal TODO Items  (Last Update: 20-Feb-2012)
 
 4) Check back with Vladimir about finishing the nanometer work.
 
-5) Do an EAGLE XML import PCBNEW PLUGIN, and possible add export support to it.
+5) Do an EAGLE XML import PCBNEW PLUGIN, and possibly add export support to it.
    This is PLUGIN::Load() and maybe PLUGIN::Save().
 
 6) Get back to the SWEET work.
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index fa62afd7c6..4d8b3f7a45 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -783,10 +783,10 @@ void KICAD_PLUGIN::loadSETUP()
 
         else if( TESTLINE( "GridOrigin" ) )
         {
+            /* @todo
             BIU gx = biuParse( line + SZ( "GridOrigin" ), &data );
             BIU gy = biuParse( data );
 
-            /* @todo
             GetScreen()->m_GridOrigin.x = Ox;
             GetScreen()->m_GridOrigin.y = Oy;
             */