diff --git a/ChangeLog b/ChangeLog
index 3ebcd4fd7..71784035a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2008-07-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/song_editor.h:
+	* src/core/song.cpp:
+	make sure all TCOs are shown after loading project (closes #2016741)
+
+	* src/core/automatable_model.cpp:
+	when loading legacy automation with only one value in, eliminate
+	global automation pattern right after loading data
+
+	* src/core/main.cpp:
+	- initialize random-number generation - fixes problems with duplicate
+	  JO-IDs
+	- show main-window before loading project given on command-line or
+	  creating a new project (closes #2016741)
+
+	* src/core/automation_pattern.cpp:
+	fixed some segfaults in case of invalid objects in object-vector
+
 	* src/core/mmp.cpp:
 	- use QTextStream to save uncompressed XML-files
 	- when encountering problems while parsing XML-file, print line and
diff --git a/include/song_editor.h b/include/song_editor.h
index ae78331f4..2ce4a7c8d 100644
--- a/include/song_editor.h
+++ b/include/song_editor.h
@@ -57,9 +57,12 @@ signals:
 	void periodicUpdate( void );
 
 
+public slots:
+	void scrolled( int _new_pos );
+
+
 private slots:
 	void setHighQuality( bool );
-	void scrolled( int _new_pos );
 
 	void play( void );
 	void stop( void );
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 7610d9fe5..35f079157 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -952,6 +952,10 @@ void song::loadProject( const QString & _file_name )
 	{
 		engine::getMainWindow()->resetWindowTitle();
 	}
+	if( engine::getSongEditor() )
+	{
+		engine::getSongEditor()->scrolled( 0 );
+	}
 }
 
 
@@ -976,9 +980,10 @@ bool song::saveProject( void )
 	{
 		engine::getPianoRoll()->saveState( mmp, mmp.content() );
 		engine::getAutomationEditor()->saveState( mmp, mmp.content() );
-		( (journallingObject *)( engine::getProjectNotes() ) )->saveState( mmp,
-								mmp.content() );
-		m_playPos[Mode_PlaySong].m_timeLine->saveState( mmp, mmp.content() );
+		( (journallingObject *)( engine::getProjectNotes() ) )->
+						saveState( mmp, mmp.content() );
+		m_playPos[Mode_PlaySong].m_timeLine->saveState(
+							mmp, mmp.content() );
 	}
 
 	saveControllerStates( mmp, mmp.content() );