diff --git a/ruby/lib/jam_ruby/models/music_session_comment.rb b/ruby/lib/jam_ruby/models/music_session_comment.rb
index e9d213574..5771bdc30 100644
--- a/ruby/lib/jam_ruby/models/music_session_comment.rb
+++ b/ruby/lib/jam_ruby/models/music_session_comment.rb
@@ -7,8 +7,13 @@ module JamRuby
 
     default_scope order('created_at DESC')
 
-    belongs_to :music_session_history, :class_name => "JamRuby::MusicSessionHistory", :foreign_key => "music_session_id"
-    belongs_to :user, :class_name => "JamRuby::User", :foreign_key => "creator_id"
+    belongs_to(:music_session_history,
+    		   :class_name => "JamRuby::MusicSessionHistory",
+    		   :foreign_key => "music_session_id")
+
+    belongs_to(:user,
+    		   :class_name => "JamRuby::User",
+    		   :foreign_key => "creator_id")
 
   end
 end
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/music_session_history.rb b/ruby/lib/jam_ruby/models/music_session_history.rb
index 0ceca19bf..d1b41016a 100644
--- a/ruby/lib/jam_ruby/models/music_session_history.rb
+++ b/ruby/lib/jam_ruby/models/music_session_history.rb
@@ -3,7 +3,7 @@ module JamRuby
 
     self.table_name = "music_sessions_history"
 
-    self.primary_key = 'music_session_id'
+    self.primary_key = 'id'
 
     belongs_to(:user, 
                :class_name => 'JamRuby::User', 
@@ -130,5 +130,16 @@ module JamRuby
         .order('created_at DESC')
     end
 
+    def comments
+      @comments ||= JamRuby::MusicSessionComment
+        .where(:music_session_id => self.music_session_id)
+        .order('created_at DESC')
+    end
+
+    def likes
+      @likes ||= JamRuby::MusicSessionLiker
+        .where(:music_session_id => self.music_session_id)
+    end
+
   end
 end
diff --git a/ruby/lib/jam_ruby/models/music_session_liker.rb b/ruby/lib/jam_ruby/models/music_session_liker.rb
index 16ec64372..9b4cb69df 100644
--- a/ruby/lib/jam_ruby/models/music_session_liker.rb
+++ b/ruby/lib/jam_ruby/models/music_session_liker.rb
@@ -5,8 +5,13 @@ module JamRuby
 
     self.primary_key = 'id'
 
-    belongs_to :music_session_history, :class_name => "JamRuby::MusicSessionHistory", :foreign_key => "music_session_id"
-    belongs_to :user, :class_name => "JamRuby::User", :foreign_key => "liker_id"
+    belongs_to(:music_session_history,
+    		   :class_name => "JamRuby::MusicSessionHistory",
+    		   :foreign_key => "music_session_id")
+
+    belongs_to(:user,
+    		   :class_name => "JamRuby::User",
+    		   :foreign_key => "liker_id")
 
   end
 end
\ No newline at end of file