diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 11b7fb404..be133bb53 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -7,6 +7,7 @@ class PhotosController < ApplicationController
   
   def create
     @photo = Photo.new(params[:photo])
+    @photo.person = current_user
     
     if @photo.save
       flash[:notice] = "Successfully uploaded photo."
diff --git a/app/models/post.rb b/app/models/post.rb
index 9b711d6ce..81c66de88 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -44,8 +44,8 @@ class Post
   end
 
 #ENCRYPTION
-  before_validation :sign_if_mine
-    validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
+  #before_validation :sign_if_mine
+    #validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
     
     xml_accessor :creator_signature
     key :creator_signature, String
diff --git a/app/views/blogs/_blog.html.haml b/app/views/blogs/_blog.html.haml
index 75fd72716..0508f846e 100644
--- a/app/views/blogs/_blog.html.haml
+++ b/app/views/blogs/_blog.html.haml
@@ -1,4 +1,7 @@
 %li.message{:id => post.id, :class => ("mine" if mine?(post))}
+
+  = person_image_tag(post.person)
+
   %span.from
     = link_to_person post.person
     %b wrote a new blog post
diff --git a/app/views/blogs/show.html.haml b/app/views/blogs/show.html.haml
index a4646414d..600ee6d0a 100644
--- a/app/views/blogs/show.html.haml
+++ b/app/views/blogs/show.html.haml
@@ -10,6 +10,9 @@
   %strong Owner:
   = @blog.person.real_name
 
+%h4= "comments (#{@blog.comments.count})"
+= render "comments/comments", :post => @blog
+
 %p
   = link_to "Edit", edit_blog_path(@blog)
   |
diff --git a/app/views/bookmarks/_bookmark.html.haml b/app/views/bookmarks/_bookmark.html.haml
index 9e58d056f..b8fbd7c91 100644
--- a/app/views/bookmarks/_bookmark.html.haml
+++ b/app/views/bookmarks/_bookmark.html.haml
@@ -1,4 +1,7 @@
 %li.message{:id => post.id, :class => ("mine" if mine?(post))}
+
+  = person_image_tag(post.person)
+
   %span.from
     = link_to_person post.person
     %b shared a link
diff --git a/app/views/bookmarks/show.html.haml b/app/views/bookmarks/show.html.haml
index 4b22ba43a..8b0de0233 100644
--- a/app/views/bookmarks/show.html.haml
+++ b/app/views/bookmarks/show.html.haml
@@ -10,6 +10,9 @@
   %strong Owner:
   = @bookmark.person.real_name
 
+%h4= "comments (#{@bookmark.comments.count})"
+= render "comments/comments", :post => @bookmark
+
 %p
   = link_to "Edit", edit_bookmark_path(@bookmark)
   |
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 998a497a7..f66accc3c 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -1,3 +1,15 @@
 %li.message{:id => post.id}
+
+  = person_image_tag(post.person)
+
+  %span.from
+    = link_to_person post.person
+    %b posted a new photo
+    %br
   = link_to (image_tag post.image.url(:small_thumb)), photo_path(post)
     
+  %div.time
+    = link_to(how_long_ago(post), status_message_path(post))
+    \--
+    = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
+  = render   "comments/comments", :post => post 
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index adcbce23b..cf608098e 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -1,8 +1,9 @@
 - title "Photo"
 
-%p
-  %strong Photo:
-  = image_tag @photo.image.url
+= image_tag @photo.image.url
+
+%h4= "comments (#{@photo.comments.count})"
+= render "comments/comments", :post => @photo
   
 %p
   = link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 85c39c268..f40a47884 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -8,6 +8,9 @@
   %strong Owner:
   = @status_message.person.real_name
 
+%h4= "comments (#{@status_message.comments.count})"
+= render "comments/comments", :post => @status_message
+
 %p
   = link_to "Destroy", @status_message, :confirm => 'Are you sure?', :method => :delete
   |