diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 3f508d0820..1182e65c53 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -21,6 +21,7 @@
 #include "GameState.h"
 #include "math.h"
 #include "NotesLoaderSM.h"
+#include "RageLog.h"
 
 
 NoteData::NoteData()
@@ -30,8 +31,8 @@ NoteData::NoteData()
 
 void NoteData::Init()
 {
+	m_iNumTracks = 0;	// must do this before calling ClearAll()!
 	ClearAll();
-	m_iNumTracks = 0;
 }
 
 NoteData::~NoteData()
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index a067dcd7e7..ddc9cedbd2 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -413,7 +413,7 @@ void Song::TidyUpData()
 	else	// ! HasMusic()
 	{
 		m_fMusicLengthSeconds = 100;		// guess
-		LOG->Warn("File %s has no music; guessing at %f seconds", m_fMusicLengthSeconds);
+		LOG->Warn("This song has no music file; guessing at %f seconds", m_fMusicLengthSeconds);
 	}
 
 	/* Generate these before we autogen notes, so the new notes can inherit
@@ -446,6 +446,8 @@ void Song::TidyUpData()
 	// image is the banner, which is the background, and which is the CDTitle.
 	//
 
+	LOG->Trace("Looking for images...");
+
 	//
 	// First, check the file name for hints.
 	//
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index b01c5fb48e..c0f030284f 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -19,7 +19,7 @@
 !define PRODUCT_NAME_VER "${PRODUCT_NAME} ${VERSION}"
 
 Name "${PRODUCT_NAME}"
-OutFile "stepmania-CVS-20030207.exe"
+OutFile "stepmania-CVS-20030209.exe"
 ;OutFile "stepmania301.exe"
 
 ; Some default compiler settings (uncomment and change at will):
@@ -145,7 +145,7 @@ File /r "NoteSkins\dance\note"
 
 SetOutPath "$INSTDIR\NoteSkins\pump"
 File /r "NoteSkins\pump\classic" ; what the heck, they're tiny
-File /r "NoteSkins\pump\shiny"
+;File /r "NoteSkins\pump\shiny"	; not in CVS anymore? -Chris
 
 SetOutPath "$INSTDIR\NoteSkins\ez2"
 File /r "NoteSkins\ez2\original"
@@ -265,7 +265,7 @@ RMDir /r "$INSTDIR\NoteSkins\dance\flat"
 RMDir /r "$INSTDIR\NoteSkins\dance\note"
 RMDir "$INSTDIR\NoteSkins\dance"
 RMDir /r "$INSTDIR\NoteSkins\pump\classic"
-RMDir /r "$INSTDIR\NoteSkins\pump\shiny"
+;RMDir /r "$INSTDIR\NoteSkins\pump\shiny"	; not in CVS anymore? -Chris
 RMDir "$INSTDIR\NoteSkins\pump"
 RMDir /r "$INSTDIR\NoteSkins\ez2\original"
 RMDir "$INSTDIR\NoteSkins\ez2"