diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4b851433e..4a33a2b42 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,6 @@
 class ApplicationController < ActionController::Base
+  require 'lib/diaspora/ostatus_generator'
+  
   protect_from_forgery :except => :receive
   layout 'application'
   
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index 16b2b9d5f..6b76a27b1 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -11,5 +11,5 @@
 
   %div.image_cycle
     - for photo in post.photos[0..3]
-      = image_tag photo.image.url(:thumb_large)
+      = link_to (image_tag photo.image.url(:thumb_large)), album_path(post)
     
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 674f8ab0c..0a90b024e 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -2,6 +2,7 @@
   = link_to 'albums', albums_path
   >>
   = @album.name 
+  %h5= "last updated: #{how_long_ago(@album)}"
 -unless mine? @album
   %h4= 'by ' + @album.person.real_name
 -if mine? @album
@@ -11,4 +12,4 @@
 
 -if mine? @album
   %p
-    = link_to "Destroy", @album, :confirm => 'Are you sure?', :method => :delete
+    = link_to "Delete Album", @album, :confirm => 'Are you sure?', :method => :delete
diff --git a/lib/diaspora/ostatus_generator.rb b/lib/diaspora/ostatus_generator.rb
index d4bf55379..92a2bfa7a 100644
--- a/lib/diaspora/ostatus_generator.rb
+++ b/lib/diaspora/ostatus_generator.rb
@@ -53,7 +53,7 @@ module Diaspora
       def self.entries(objects)
         xml = ""
         if objects.respond_to? :each
-          objects.each {|x| xml << x.to_ostatus}
+          objects.each {|x| xml << x.to_activity}
         else
           xml << objects.to_activity
         end
diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
index 3bc3e9b13..99965467e 100644
--- a/public/javascripts/publisher.js
+++ b/public/javascripts/publisher.js
@@ -6,6 +6,7 @@
     $("#publisher_content_pickers .photo").click(selectPublisherTab);
 	
 	$("#new_status_message").submit(function() {
+		
 		var new_status = $('#status_message_message').val() + " - just now";
 		$('#latest_message').text( new_status );
 	});