diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index 0472b557ea..9e03741f6e 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -252,7 +252,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
     info.AddTranslator( new Contributor( wxT( "Kenta Yonekura" ),
                                         wxT( "midpika@hotmail.com" ), wxT( "Japanese (JA)" ),
                                         new wxBitmap( lang_jp_xpm ) ) );
-    info.AddTranslator( new Contributor( wxT( "Milonas Kostas" ),
+    info.AddTranslator( new Contributor( wxT( "Manolis Stefanis and Milonas Kostas" ),
                                         wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ),
                                         new wxBitmap( lang_gr_xpm ) ) );
 
diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index 46e944f4af..c29787f01a 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -1209,10 +1209,10 @@ void EDA_DRAW_PANEL::EndMouseCapture( int id, int cursor, const wxString& title
     {
         INSTALL_UNBUFFERED_DC( dc, this );
         m_endMouseCaptureCallback( this, &dc );
-        m_mouseCaptureCallback = NULL;
-        m_endMouseCaptureCallback = NULL;
-        m_AutoPAN_Request = false;
     }
+    m_mouseCaptureCallback = NULL;
+    m_endMouseCaptureCallback = NULL;
+    m_AutoPAN_Request = false;
 
     if( id != -1 && cursor != -1 )
     {
diff --git a/common/zoom.cpp b/common/zoom.cpp
index 042ab02bb6..9b4a042602 100644
--- a/common/zoom.cpp
+++ b/common/zoom.cpp
@@ -119,6 +119,7 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
         break;
 
     case ID_POPUP_ZOOM_CENTER:
+        center = screen->GetCrossHairPosition();
         RedrawScreen( center, true );
         break;
 
diff --git a/demos/interf_u/interf_u.pro b/demos/interf_u/interf_u.pro
index cbafb9cda6..5653c00b9a 100644
--- a/demos/interf_u/interf_u.pro
+++ b/demos/interf_u/interf_u.pro
@@ -1,4 +1,4 @@
-update=04/02/2011 22:02:33
+update=17/02/2011 19:33:13
 version=1
 last_client=pcbnew
 [common]
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index ac230abdd2..dba7e8e852 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -89,7 +89,12 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* screen, int FileSave )
     if( !success )
         DisplayError( this, _( "File write operation failed." ) );
     else
+    {
         screen->ClrModify();
+        wxString msg;
+        msg.Printf( wxT("File %s saved"), GetChars(screen->GetFileName() ) );
+        SetStatusText(msg, 0);
+    }
 
 
     fclose( f );
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 11269be011..02bf646aeb 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -129,6 +129,7 @@ void WinEDA_BasePcbFrame::CursorGoto(  const wxPoint& aPos )
     /* There may be need to reframe the drawing. */
     if( !DrawPanel->IsPointOnDisplay( aPos ) )
     {
+        screen->SetCrossHairPosition( aPos );
         RedrawScreen( aPos, true );
     }
     else
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index 43c3c16189..017d7e65b9 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -120,7 +120,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
     case ID_POPUP_CANCEL_CURRENT_COMMAND:
         if( DrawPanel->IsMouseCaptured() )
         {
-            DrawPanel->m_endMouseCaptureCallback( DrawPanel, &dc );
+            DrawPanel->EndMouseCapture();
         }
 
         /* Should not be executed, just in case */