diff --git a/stepmania/NEWS b/stepmania/NEWS
index e89ff11412..bfac9e8e0e 100644
--- a/stepmania/NEWS
+++ b/stepmania/NEWS
@@ -19,6 +19,8 @@ BUG FIX:  Para demonstation no longer crashes.
 BUG FIX:  DWI reader now reads fractional BPM and FREEZE index values (e.g. 
 	Alya Part 2).
 BUG FIX:  Fixed ez2 real style spacing
+CHANGE:  #SAMPLESTART tag now written in DWI files
+CHANGE:  Editor now snaps while recording
 	
 ------------------------CVS after 3.00 beta 6----------------
 CHANGE:  Missing a jump with the Oni life meter now subtracts only 1 life.
diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris
index 41ccef3178..fd965a1d6d 100644
--- a/stepmania/TODO.chris
+++ b/stepmania/TODO.chris
@@ -2,20 +2,29 @@
 Fix
 /////////////////////////
 
-fix weird colors in recording
 
-weird dik_p
+There's a major Oni course bug (at least in Pump mode):
+
+If you set a certain song to have modifiers, those modifiers will carry over to the next songs unless you change them. I don't think this was the original intention of how each #SONG line is supposed to work? Every time you finish a song, aren't the modifiers supposed to be reset for the next line unless that line sets it's own modifiers. This is a problem because, at least from what the README indicates, there's no normal setting for each modifier type (for e.g, no 1.0x to return to normal speed).
+
+I'll abbreviate a course file I did:
+
+#SONG:Pump\Artist1 - SongTitle1:EASY:0.5x,dizzy;
+#SONG:Pump\Artist2 - SongTitle2:MEDIUM;
+
+The problem is on song 2, it still gets the 0.5x and dizzy modifiers. Shouldn't they be reset for the 2nd song? 
 
 
+performane issues
 
-I noticed 2 things with Challenge Mode, one new to this release candidate, and one that I've noticed since I've started using SM in Beta 5.
+ready, here we go closer to start (dive into the night)
 
-1) The timer at the end of the song jumps about 1:30 for a brief period of time. Perhaps it's adding the length of the next song. Once the next song starts however, it goes back the 1:30 or so back to what it was supposed to be. This is a new bug as far as I know.
-
-2) On Kidou II, the final song, Kakumei is on Reverse/Dark and stuff, but the green heavy logo doesn't move to the top of the screen like all the other reverse songs do. And especially when it's on dark, the bottom of the screen is partially blocked by this Heavy logo. I know if I pick Reverse in any other mode, the Heavy logo will move up below the health meter, but it doesn't for Challenge Mode, or at least this course anyway. This bug has been present since Beta 5.
+long ver balloon
 
 crowd cheer on AA or greater
 
+notefield length on play record and in gameplay
+
 - ez2dancer missing graphic
 
 - fade between random movies
diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp
index 7b04d204a7..261306972e 100644
--- a/stepmania/src/RageBitmapTexture.cpp
+++ b/stepmania/src/RageBitmapTexture.cpp
@@ -158,7 +158,7 @@ void RageBitmapTexture::Create(
 			iMipMaps,					// mip map levels
 			0,							// usage (is a render target?)
 			fmtTexture,					// our preferred texture format
-			D3DPOOL_DEFAULT,			// which memory pool
+			D3DPOOL_MANAGED,			// which memory pool
 			(bStretch ? D3DX_FILTER_LINEAR : D3DX_FILTER_NONE) | (bDither ? D3DX_FILTER_DITHER : 0),		// filter
 			D3DX_FILTER_BOX | (bDither ? D3DX_FILTER_DITHER : 0),				// mip filter
 			D3DCOLOR_ARGB(255,255,0,255), // pink color key
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index ddda712b2c..22e367d693 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -617,7 +617,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 					if( PREFSMAN->m_iDisplayResolution != 640 )
 						PREFSMAN->m_iDisplayResolution = 640;
 					else
-						PREFSMAN->m_iDisplayResolution = 400;
+						PREFSMAN->m_iDisplayResolution = 320;
 
 					ApplyGraphicOptions();
 					return 0;