diff --git a/PBot/IRCHandlers.pm b/PBot/IRCHandlers.pm
index bfdef905..9e38935a 100644
--- a/PBot/IRCHandlers.pm
+++ b/PBot/IRCHandlers.pm
@@ -109,6 +109,8 @@ sub on_notice {
 
 sub on_action {
   my ($self, $conn, $event) = @_;
+
+  $event->{args}[0] = "/me " . $event->{args}[0];
   
   $self->on_public($conn, $event);
 }
@@ -182,7 +184,6 @@ sub on_join {
   my ($self, $conn, $event) = @_;
   my ($nick, $user, $host, $channel) = ($event->nick, $event->user, $event->host, $event->to);
 
-  #$self->{pbot}->logger->log("$nick!$user\@$host joined $channel\n");
   $self->{pbot}->antiflood->check_flood($channel, $nick, $user, $host, "JOIN", 4, 60 * 30, $self->{pbot}->antiflood->{FLOOD_JOIN});
 }
 
diff --git a/PBot/Quotegrabs.pm b/PBot/Quotegrabs.pm
index d78211ae..bcc350cc 100644
--- a/PBot/Quotegrabs.pm
+++ b/PBot/Quotegrabs.pm
@@ -161,7 +161,7 @@ sub grab_quotegrab {
   }
 
   if(not defined $arguments) {
-    return "Usage: grab <nick> [history] [channel] -- where [history] is an optional argument that is either an integer number of recent messages or a regex (without whitespace) of the text within the message; e.g., to grab the 3rd most recent message for nick, use `grab nick 3` or to grab a message containing 'pizza', use `grab nick pizza`; and [channel] is an optional channel, so you can use it from /msg (you will need to also specify [history] in this case)";
+    return "Usage: grab <nick> [history [channel]] -- where [history] is an optional argument that is either an integer number of recent messages or a regex (without whitespace) of the text within the message; e.g., to grab the 3rd most recent message for nick, use `grab nick 3` or to grab a message containing 'pizza', use `grab nick pizza`; and [channel] is an optional channel, so you can use it from /msg (you will need to also specify [history] in this case)";
   }
 
   $arguments = lc $arguments;
@@ -249,10 +249,13 @@ sub grab_quotegrab {
   
   $self->save_quotegrabs();
   
-  my $msg = $messages[$grab_history]->{msg};
-  #$msg =~ s/(.{21}).*/$1.../;
-  
-  return "Quote grabbed: " . ($#{ $self->{quotegrabs} } + 1) . ": <$grab_nick> $msg";
+  my $text = $quotegrab->{text};
+
+  if($text =~ s/^\/me\s+//) {
+      return "Quote grabbed: " . ($#{ $self->{quotegrabs} } + 1) . ": * $grab_nick $text";
+  } else {
+      return "Quote grabbed: " . ($#{ $self->{quotegrabs} } + 1) . ": <$grab_nick> $text";
+  }
 }
 
 sub add_quotegrab {
@@ -273,7 +276,7 @@ sub delete_quotegrab {
   my ($self, $from, $nick, $user, $host, $arguments) = @_;
 
   if($arguments < 1 || $arguments > $#{ $self->{quotegrabs} } + 1) {
-    return "/msg $nick Valid range for !getq is 1 - " . ($#{ $self->{quotegrabs} } + 1);
+    return "/msg $nick Valid range for `getq` is 1 - " . ($#{ $self->{quotegrabs} } + 1);
   }
 
   my $quotegrab = $self->{quotegrabs}[$arguments - 1];
@@ -284,7 +287,14 @@ sub delete_quotegrab {
   }
 
   $self->save_quotegrabs();
-  return "Deleted $arguments: <$quotegrab->{nick}> $quotegrab->{text}";
+
+  my $text = $quotegrab->{text};
+
+  if($text =~ s/^\/me\s+//) {
+      return "Deleted $arguments: * $quotegrab->{nick} $text";
+  } else {
+      return "Deleted $arguments: <$quotegrab->{nick}> $text";
+  }
 }
 
 sub show_quotegrab {
@@ -297,7 +307,13 @@ sub show_quotegrab {
   my $quotegrab = $self->{quotegrabs}[$arguments - 1];
   my $timestamp = $quotegrab->{timestamp};
   my $ago = ago(gettimeofday - $timestamp);
-  return "$arguments: grabbed by $quotegrab->{grabbed_by} on " . localtime($timestamp) . " [$ago] <$quotegrab->{nick}> $quotegrab->{text}";
+  my $text = $quotegrab->{text};
+
+  if($text =~ s/^\/me\s+//) {
+      return "$arguments: grabbed by $quotegrab->{grabbed_by} on " . localtime($timestamp) . " [$ago] * $quotegrab->{nick} $text";
+  } else {
+      return "$arguments: grabbed by $quotegrab->{grabbed_by} on " . localtime($timestamp) . " [$ago] <$quotegrab->{nick}> $text";
+  }
 }
 
 sub show_random_quotegrab {
@@ -340,14 +356,20 @@ sub show_random_quotegrab {
   
   if($#quotes < 0) {
     if($nick_search eq ".*") {
-      return "No quotes grabbed in $channel_search yet (use `rq <nick> <channel>` to specify the correct channel).  Use `grab` to grab a quote.";
+      return "No quotes grabbed in $channel_search yet (use `rq [nick [channel]]` to specify the correct channel).  Use `grab` to grab a quote.";
     } else {
-      return "No quotes grabbed for $nick_search in $channel_search yet (use `rq <nick> <channel>` to specify the correct channel)..  Use `grab` to grab a quote.";
+      return "No quotes grabbed for $nick_search in $channel_search yet (use `rq [nick [channel]]` to specify the correct channel)..  Use `grab` to grab a quote.";
     }
   }
 
   my $quotegrab = $quotes[int rand($#quotes + 1)];
-  return "$quotegrab->{id}: <$quotegrab->{nick}> $quotegrab->{text}";
+  my $text = $quotegrab->{text};
+
+  if($text =~ s/^\/me\s+//) {
+      return "$quotegrab->{id}: * $quotegrab->{nick} $text";
+  } else {
+      return "$quotegrab->{id}: <$quotegrab->{nick}> $text";
+  }
 }
 
 1;
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index ad2c3465..6efb4106 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,8 +13,8 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 406,
-  BUILD_DATE     => "2013-06-03",
+  BUILD_REVISION => 407,
+  BUILD_DATE     => "2013-06-04",
 };
 
 1;
diff --git a/data/quotegrabs b/data/quotegrabs
index b247aeaf..85760d61 100644
--- a/data/quotegrabs
+++ b/data/quotegrabs
@@ -38,7 +38,7 @@ tor]{ ##philosophy 1260648768.92263 pragma_ benzap..forcing a belief on to peopl
 Nately ##philosophy 1260689740.5131 pragma_ is there still random fap?
 Incarnation ##philosophy 1260766213.17936 pragma_ and I'm not saying I'm smart
 gnech ##c 1260766721.60784 spv are there any good tutorials on how to code webpages using C
-Zhivago ##c 1260775613.60165 ColonelJ waits for the moment of illumination.
+Zhivago ##c 1260775613.60165 ColonelJ /me waits for the moment of illumination.
 patrisk ##c 1260822079.36312 pragma_ I wonder how many K&R books have been sold because of this channel.
 pragma_ ##philosophy 1260828964.99089 pragma_ I've known for a long while that politicans and rulers do not live by their own constitutions or rules; they preach one thing, and do a different thing in privacy; schools are just day-care centers and training camps to brainwash more complacant sheep for the diplomats and bureaucracies to utilize as slaves; paychecks are just a facade when you consider how much money the top dogs are making compared to the so-called workers
 R0b0t1 ##c 1260830770.32572 pragma_ I wrote a audio driver in brainfuck once.
@@ -185,7 +185,7 @@ zhivago ##c 1343961169.20752 pragma- hays: Re-read what I said, and try to think
 zhivago ##c 1343964427.29518 pragma- "I know, I'll convert my string from utf-16 to utf-32 when users want to select a character and copy it to the clibport, because that will be less trouble!"
 kate` ##c 1343972090.39981 pragma- dardevelin: thank you for the feeback, though; next time you ask for something, i shall refrain from giving my input
 kate` ##c 1343973170.46784 pragma- hey, what do i know? you just told me to shut up, when i was trying to help you. somehow i don't feel like teaching you how to do this
-kate` ##c 1343973926.43453 pragma- stabs herself in the face
+kate` ##c 1343973926.43453 pragma- /me stabs herself in the face
 zhivago ##c 1343982418.68603 pragma- Do you have a C book, or are you just banging on the keyboard like a monkey?
 orbitz ##c 1344035770.70519 pragma- ambro718: You never fail to impress me with your ability to create absolutely ridiculous situations that probably don't need to exist in the first place
 zhivago ##c 1344048180.63503 pragma- bcsllc: If you have trouble with the arithmetic, you might ask a small child to help you.
@@ -216,3 +216,17 @@ zhivago ##c 1359976876.44201 aero1 If you're reading a byte, then you don't bloo
 caze ##c 1360166890.20033 lemonade` lemonade`: We're not in the context of real life. We're in the context of talking about C.
 poppavic ##c 1360198316.55118 Vigud #define bob addition\n#include "crap"\n#define bob subtraction\n#include "crap"....
 ss23 ##c 1360237352.68975 pragma- A programmer saw a problem and decided to solve it he would use threads. two has. Now he problems
+zhivago ##c 1360850950.05185 Vigud As far as C in unix is concerned, eclipse is like tap-dancing while riding a unicycle.
+mathi ##c 1361564859.87449 kulp daowee, the problem is that in C it may work while it is wrong :P
+zhivago ##c 1361792348.43704 Vigud I maintain that fish are happier than lobsters.
+poppavic ##c 1361916426.13017 Vigud I before C, except after Tea
+kate` ##c 1363011431.19696 kulp "imagine my code is completely different from what i'm showing you. will it work?"
+beramiah ##c-unregistered 1363060035.28276 guidj0s C n00b here: is there any way to convert from an int**arr to an arr[][]?
+edk ##c 1363260039.58065 sha0 now maybe you'd like to point to the last time I said "stack" in here
+mar77i ##c 1363706804.30748 kulp sedeki: because this channel doesn't have a bot that !grabs people?
+fizzie ##c 1366395165.91062 pragma- ,cc #define FOO__(count,v) do { int foo_##count = v; printf("foo_%s = %d\n", #count, foo_##count); } while (0)  \n  #define FOO_(count,v) FOO__(count,v)  \n  #define FOO(v) FOO_(__COUNTER__,v)  \n  FOO(42); FOO(64);
+beaky ##c 1368721794.5656 pragma- one can only hope my code never ends up running a live system with lives at stake
+pragma- ##c 1369261094.94262 pragma- seen in ##java just now:  "Can someone tell me if this code is correct?  <pastebin>"  "Does it compile?"  "Nope :("  "Then it's not correct."
+ne2k ##c 1370363463.13971 pragma- why is printf so complicated? it's, like, half of C was invented just so printf would work!!!!!11
+cousteau ##c 1370363580.66943 pragma- I can't believe I'm not yet in the qdb with all the pile of brainfarts I say all day
+pragma- #pbot2 1370365407.79333 pragma- /me rolls his eyes.