diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris
index 0cb32205c4..9ece6f52a9 100644
--- a/stepmania/TODO.chris
+++ b/stepmania/TODO.chris
@@ -2,6 +2,34 @@
 Fix
 /////////////////////////
 
+note coloring in graphic, NoteColor with add?
+
+remove shadow from everywhere
+
+separate credits screen
+
+handle demonstration in a more graceful way
+
+reset titlemenu timeout if button pressed
+
+new Message/Object system
+
+replace Mini -> Zoom
+
+sort ini before writing
+
+autoplay and tick icons
+
+autogen and edit icon
+
+dynamically sized NoteData
+
+replace judge window prefs with window* and WindowScale
+
+email about voodoo3 card at home
+
+BGAnimation speed with different song rates
+
 remove 4x diffuse colors
 
 change noteskin format (get rid of .colors)
@@ -53,10 +81,15 @@ I'll abbreviate a course file I did:
 
 The problem is on song 2, it still gets the 0.5x and dizzy modifiers. Shouldn't they be reset for the 2nd song? 
 
+better documentation
 
 performane issues
 
-ready, here we go closer to start (dive into the night)
+cheer on gameplay start
+
+break cheer into separate trigger
+
+ready, here we go closer to start (ButterFly)
 
 long ver balloon
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 4308d27632..277be4f19c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -726,3 +726,9 @@ Theme=Choose from this list of installed theme packs.::For more information abou
 NoteSkin=Choose from this list of installed note skins.::For more information about creating a note skin, see the README.
 HowToPlay=Toggle whether the How To Play screen is shown.
 
+[ScreenNetworkWaiting]
+ServerInfoX=320
+ServerInfoY=120
+PlayerListX=320
+PlayerListY=280
+HelpText=Press Up to join, Down to unjoin.::Wait for more players to enter the game before joining.
diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp
index 510036c3c8..01a815c26b 100644
--- a/stepmania/src/RageMath.cpp
+++ b/stepmania/src/RageMath.cpp
@@ -14,8 +14,13 @@
 #include "RageMath.h"
 #include "RageTypes.h"
 
+#ifdef _DEBUG
+#pragma comment(lib, "plib-1.6.0/sg_d.lib")
+#pragma comment(lib, "plib-1.6.0/ul_d.lib")
+#else
 #pragma comment(lib, "plib-1.6.0/sg.lib")
 #pragma comment(lib, "plib-1.6.0/ul.lib")
+#endif
 
 void RageVec2Normalize( RageVector2* pOut, const RageVector2* pV )
 {
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index c8955a37f2..589d129fd6 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -756,7 +756,7 @@ float calc_stddev(const float *start, const float *end)
 	return dev;
 }
 
-void TrimLeft(string &str, const char *s)
+void TrimLeft(CString &str, const char *s)
 {
 	int n = 0;
 	while(n < int(str.size()) && strchr(s, str[n]))
@@ -765,7 +765,7 @@ void TrimLeft(string &str, const char *s)
 	str.erase(str.begin(), str.begin()+n);
 }
 
-void TrimRight(string &str, const char *s)
+void TrimRight(CString &str, const char *s)
 {
 	int n = str.size();
 	while(n > 0 && strchr(s, str[n-1]))
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index ea1a880abf..69552a580a 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -29,10 +29,15 @@ inline int RECTCENTERX(RECT rect) { return rect.left + (rect.right-rect.left)/2;
 inline int RECTCENTERY(RECT rect) { return rect.top + (rect.bottom-rect.top)/2; }
 
 /* Common harmless mismatches. */
+#ifndef min
 inline float min(float a, int b) { return a < b? a:b; }
-inline float max(float a, int b) { return a > b? a:b; }
 inline float min(int a, float b) { return a < b? a:b; }
+#endif
+
+#ifndef max
+inline float max(float a, int b) { return a > b? a:b; }
 inline float max(int a, float b) { return a > b? a:b; }
+#endif
 
 /* Traditional defines.  Only use this if you absolutely need
  * a constant value. */
@@ -187,8 +192,8 @@ HINSTANCE GotoURL(const char *url);
 float calc_mean(const float *start, const float *end);
 float calc_stddev(const float *start, const float *end);
 
-void TrimLeft(string &str, const char *s = "\r\n\t ");
-void TrimRight(string &str, const char *s = "\r\n\t ");
+void TrimLeft(CString &str, const char *s = "\r\n\t ");
+void TrimRight(CString &str, const char *s = "\r\n\t ");
 
 /* Fix Windows breakage ... */
 #ifdef WIN32
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index 1a2a518df0..73d11b5b47 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -66,6 +66,7 @@ const CString CREDIT_LINES[] =
 	"",
 	"TESTING:",
 	"Gotetsu",
+	"spds (James Sanders)",
 	"",
 	"",
 	"",
diff --git a/stepmania/src/plib-1.6.0/sg_d.lib b/stepmania/src/plib-1.6.0/sg_d.lib
index e36d17722b..30e5be7122 100644
Binary files a/stepmania/src/plib-1.6.0/sg_d.lib and b/stepmania/src/plib-1.6.0/sg_d.lib differ
diff --git a/stepmania/src/plib-1.6.0/ul_d.lib b/stepmania/src/plib-1.6.0/ul_d.lib
index 41c9892743..09a6fe1a3b 100644
Binary files a/stepmania/src/plib-1.6.0/ul_d.lib and b/stepmania/src/plib-1.6.0/ul_d.lib differ