diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index aa3b036765..ce0b2a366c 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -257,7 +257,7 @@ MusicWheel::MusicWheel()
 
 
 	if( GAMEINFO->m_pCurSong == NULL	// if there is no currently selected song
-		&&  GAMEINFO->m_pSongs[0] )		// and there is at least one song
+		&&  GAMEINFO->m_pSongs.GetSize() > 0 )		// and there is at least one song
 	{
 		GAMEINFO->m_pCurSong = GAMEINFO->m_pSongs[0];	// select the first song
 	}
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 501e83594a..3e0b1b7765 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -216,6 +216,22 @@ SOURCE=.\WindowDancing.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\WindowEdit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\WindowEdit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\WindowEditMenu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\WindowEditMenu.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\WindowGameOptions.cpp
 # End Source File
 # Begin Source File
diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.cpp b/stepmania/src/smpackage/SMPackageInstallDlg.cpp
index 526e29fe5b..311b6fc5fc 100644
--- a/stepmania/src/smpackage/SMPackageInstallDlg.cpp
+++ b/stepmania/src/smpackage/SMPackageInstallDlg.cpp
@@ -166,10 +166,18 @@ void CSMPackageInstallDlg::OnOK()
 	// Unzip the SMzip package into the Stepmania installation folder
 	for( int i=0; i<m_zip.GetCount(); i++ )
 	{
-		CZipFileHeader fh;
-		m_zip.GetFileInfo(fh, (WORD)i);
-		//AfxMessageBox( ssprintf( "Trying to extract '%s'", fh.GetFileName()) );
+		// Throw some text up so the user has something to look at during the long pause.
+		CEdit* pEdit1 = (CEdit*)GetDlgItem(IDC_EDIT_MESSAGE1);
+		pEdit1->SetWindowText( ssprintf("Installing '%s'.  Please wait...", m_sPackagePath) );
+		CEdit* pEdit2 = (CEdit*)GetDlgItem(IDC_EDIT_MESSAGE2);
+		pEdit2->SetWindowText( "" );
+		CEdit* pEdit3 = (CEdit*)GetDlgItem(IDC_EDIT_MESSAGE3);
+		pEdit3->SetWindowText( "" );
+		SendMessage( WM_PAINT );
+		UpdateWindow();		// Force the silly thing to hadle WM_PAINT now!
 
+
+		// Extract the files
 		try
 		{	
 			m_zip.ExtractFile( (WORD)i, szCurrentDirectory, true );	// extract file to current directory