diff --git a/trunk/Makefile b/trunk/Makefile
index 3cf23418..4cd5f27f 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -8,4 +8,5 @@ clean:
 install:
 	rsync *.py ~/bin/ocarina-bin/
 	cp ocarina ~/bin/ocarina-bin/
-	ln -s ~/bin/ocarina-bin/ocarina ~/bin/
+	rm ~/bin/ocarina
+	ln -s /home/bjschuma/bin/ocarina-bin/ocarina /home/bjschuma/bin/ocarina
diff --git a/trunk/ocarina b/trunk/ocarina
index c6d52a04..e53e76ec 100755
--- a/trunk/ocarina
+++ b/trunk/ocarina
@@ -1,2 +1,3 @@
 #!/bin/bash
+cd ~/bin/ocarina-bin
 /usr/bin/python ocarina.py $@
diff --git a/trunk/playlist.py b/trunk/playlist.py
index de6d9692..998ccf56 100644
--- a/trunk/playlist.py
+++ b/trunk/playlist.py
@@ -48,8 +48,8 @@ class Playlist:
 
 
 	# Play the selected song
-	def selectSong(self,module,iter,path,data):
-		self.queueSong(iter[0])
+	def selectSong(self,module,iter,path,data,list):
+		self.queueSong(list[iter][0])
 		self.opsNext(None,None)
 		self.hideWindow(None,None)
 
@@ -83,8 +83,9 @@ class Playlist:
 			treeview.append_column(col)
 		
 		treeview.set_search_column(1)
-		treeview.connect("row-activated",self.selectSong,"clicked")
+		treeview.connect("row-activated",self.selectSong,"clicked",liststore)
 		treeview.show()
+		treeview.columns_autosize()
 		self.scroll.add(treeview)
 		self.scroll.show()
 		# Go to current song, enable grid lines