diff --git a/ChangeLog b/ChangeLog
index 09fe8dedc..22730a2c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-13	Andrew Kelley	<superjoe30/at/gmail/dot/com>
+	
+	* src/gui/piano_roll.cpp:
+	- deleted commented code that I forgot to delete earlier
+
+	* TODO:
+	merged my personal todo list with the main one
+
 2008-11-13	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* ChangeLog:
diff --git a/TODO b/TODO
index 7d22d703b..9f077c48d 100644
--- a/TODO
+++ b/TODO
@@ -50,3 +50,21 @@
 - classical note-edit-window -> also ability of printing and maybe later scanning & recognition of notes
 - add FLAC as export-format?
 
+Andrew Kelley's todo:
+- piano roll, copy and paste notes 
+- remove the move tool, it's irrelevant now
+- holding control and shift shouldn't bring up the automation window
+- shift+drag to copy one or more notes
+- when dragging right click around to delete notes, show the eraser icon
+- moving a group of notes shouldn't crunch them together if brought to boundary conditions
+- moving a group with an unquantized note will quantize that note when you move the selection (this is bad)
+- undo/redo for piano roll
+- doing actions on the piano roll when LMMS doesn't have focus is glitchy
+
+- make knobs easier to tune (less sensitive)
+
+- make it so you can see the notes when putting a pattern in the playlist
+- make the menu for a channel happen when you right click, instead of renaming, and make the midi input a top-level menu item
+- segfault on quit
+- recording automation
+- dragging a note below the automation level messes up dragging it's weird and glitchy fix it
diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp
index 55de26914..1c9196190 100644
--- a/src/gui/piano_roll.cpp
+++ b/src/gui/piano_roll.cpp
@@ -1542,15 +1542,15 @@ void pianoRoll::mouseMoveEvent( QMouseEvent * _me )
 						{
 							pos_ticks = 0;
 						}
-						// TODO: upper/lower bound checks on key_num
-						/*if( key_num < lower bound )
+						// upper/lower bound checks on key_num
+						if( key_num < 0 )
 						{
-							key_num = lower bound
+							key_num = 0;
 						}
-						else if( key_num > upper bound )
+						else if( key_num > NumKeys )
 						{
-							key_num = upper bound
-						} */
+							key_num = NumKeys;
+						}
 					
 						( *it )->setPos( midiTime(
 									pos_ticks ) );
@@ -2285,32 +2285,6 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
 			// is the note in visible area?
 			if( key > 0 && key <= visible_keys )
 			{
-				/* changing the way selection works
-				 
-				 bool is_selected = false;
-				// if we're in move-mode, we may only draw notes
-				// in selected area, that have originally been
-				// selected and not notes that are now in
-				// selection because the user moved it...
-				if( m_editMode == ModeMove )
-				{
-					if( qFind( m_selNotesForMove.begin(),
-							m_selNotesForMove.end(),
-							*it ) !=
-						m_selNotesForMove.end() )
-					{
-						is_selected = true;
-					}
-				}
-				else if( key > sel_key_start &&
-					key <= sel_key_end &&
-					pos_ticks >= sel_pos_start &&
-					pos_ticks + len_ticks <=
-								sel_pos_end )
-				{
-					is_selected = true;
-				}
-				 */
 
 				// we've done and checked all, let's draw the
 				// note
@@ -2930,19 +2904,6 @@ void pianoRoll::deleteSelectedNotes( void )
 			++it;
 		}
 	}
-	
-	
-	/*
-	noteVector selected_notes;
-	getSelectedNotes( selected_notes );
-
-	const bool update_after_delete = !selected_notes.empty();
-
-	while( selected_notes.empty() == false )
-	{
-		m_pattern->removeNote( selected_notes.front() );
-		selected_notes.erase( selected_notes.begin() );
-	} */
 
 	if( update_after_delete == true )
 	{