diff --git a/include/song.h b/include/song.h
index 0fb2a2047..dc58a8d94 100644
--- a/include/song.h
+++ b/include/song.h
@@ -210,26 +210,29 @@ public:
 	void loadProject( const QString & _filename );
 	bool guiSaveProject();
 	bool guiSaveProjectAs( const QString & _filename );
-    bool saveProjectFile( const QString & _filename );
-	inline const QString & projectFileName() const
+	bool saveProjectFile( const QString & _filename );
+
+	const QString & projectFileName() const
 	{
 		return m_fileName;
 	}
-	inline bool isLoadingProject() const
+
+	bool isLoadingProject() const
 	{
 		return m_loadingProject;
 	}
-	inline bool isModified() const
+
+	bool isModified() const
 	{
 		return m_modified;
 	}
 
-	inline virtual QString nodeName() const
+	virtual QString nodeName() const
 	{
 		return "song";
 	}
 
-	virtual inline bool fixedTCOs() const
+	virtual bool fixedTCOs() const
 	{
 		return false;
 	}
@@ -274,8 +277,6 @@ public slots:
 
 	void addBBTrack();
 
-	bool isLoadingProject();
-
 
 private slots:
 	void insertBar();
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 5961a3ea3..612ee3875 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -666,8 +666,7 @@ void song::addBBTrack()
 {
 	engine::mixer()->lock();
 	track * t = track::create( track::BBTrack, this );
-	engine::getBBTrackContainer()->setCurrentBB(
-						bbTrack::numOfBBTrack( t ) );
+	engine::getBBTrackContainer()->setCurrentBB( dynamic_cast<bbTrack *>( t )->index() );
 	engine::mixer()->unlock();
 }
 
@@ -920,8 +919,7 @@ void song::loadProject( const QString & _file_name )
 		{
 			if( node.nodeName() == "trackcontainer" )
 			{
-				( (JournallingObject *)( this ) )->
-					restoreState( node.toElement() );
+				( (JournallingObject *)( this ) )->restoreState( node.toElement() );
 			}
 			else if( node.nodeName() == "controllers" )
 			{
@@ -933,37 +931,25 @@ void song::loadProject( const QString & _file_name )
 			}
 			else if( engine::hasGUI() )
 			{
-				if( node.nodeName() ==
-					engine::getControllerRackView()->nodeName() )
+				if( node.nodeName() == engine::getControllerRackView()->nodeName() )
 				{
-					engine::getControllerRackView()->
-						restoreState( node.toElement() );
+					engine::getControllerRackView()->restoreState( node.toElement() );
 				}
 				else if( node.nodeName() == engine::pianoRoll()->nodeName() )
 				{
 					engine::pianoRoll()->restoreState( node.toElement() );
 				}
-				else if( node.nodeName() ==
-					engine::automationEditor()->
-								nodeName() )
+				else if( node.nodeName() == engine::automationEditor()->nodeName() )
 				{
-					engine::automationEditor()->
-						restoreState( node.toElement() );
+					engine::automationEditor()->restoreState( node.toElement() );
 				}
-				else if( node.nodeName() ==
-						engine::getProjectNotes()->
-								nodeName() )
+				else if( node.nodeName() == engine::getProjectNotes()->nodeName() )
 				{
-					 engine::getProjectNotes()->
-			SerializingObject::restoreState( node.toElement() );
+					 engine::getProjectNotes()->SerializingObject::restoreState( node.toElement() );
 				}
-				else if( node.nodeName() ==
-						m_playPos[Mode_PlaySong].
-							m_timeLine->nodeName() )
+				else if( node.nodeName() == m_playPos[Mode_PlaySong].m_timeLine->nodeName() )
 				{
-					m_playPos[Mode_PlaySong].
-						m_timeLine->restoreState(
-							node.toElement() );
+					m_playPos[Mode_PlaySong].m_timeLine->restoreState( node.toElement() );
 				}
 			}
 		}
@@ -1019,15 +1005,13 @@ bool song::saveProjectFile( const QString & _filename )
 		engine::getControllerRackView()->saveState( dataFile, dataFile.content() );
 		engine::pianoRoll()->saveState( dataFile, dataFile.content() );
 		engine::automationEditor()->saveState( dataFile, dataFile.content() );
-		engine::getProjectNotes()->
-			SerializingObject::saveState( dataFile, dataFile.content() );
-		m_playPos[Mode_PlaySong].m_timeLine->saveState(
-							dataFile, dataFile.content() );
+		engine::getProjectNotes()->SerializingObject::saveState( dataFile, dataFile.content() );
+		m_playPos[Mode_PlaySong].m_timeLine->saveState( dataFile, dataFile.content() );
 	}
 
 	saveControllerStates( dataFile, dataFile.content() );
 
-    return dataFile.writeFile( _filename );
+	return dataFile.writeFile( _filename );
 }
 
 
@@ -1172,8 +1156,7 @@ void song::exportProject(bool multiExport)
 		efd.setFileMode( FileDialog::AnyFile );
 		int idx = 0;
 		QStringList types;
-		while( __fileEncodeDevices[idx].m_fileFormat !=
-						ProjectRenderer::NumFileFormats )
+		while( __fileEncodeDevices[idx].m_fileFormat != ProjectRenderer::NumFileFormats )
 		{
 			types << tr( __fileEncodeDevices[idx].m_description );
 			++idx;
@@ -1224,8 +1207,7 @@ void song::setModified()
 	{
 		m_modified = true;
 		if( engine::mainWindow() &&
-			QThread::currentThread() ==
-					engine::mainWindow()->thread() )
+			QThread::currentThread() == engine::mainWindow()->thread() )
 		{
 			engine::mainWindow()->resetWindowTitle();
 		}
@@ -1263,14 +1245,6 @@ void song::removeController( Controller * _controller )
 }
 
 
-
-
-bool song::isLoadingProject()
-{
-	return m_loadingProject;
-}
-
-
 #include "moc_song.cxx"