diff --git a/chatroom.chatroom.inc b/chatroom.chatroom.inc
index 6fa5ea4..17fbc98 100755
--- a/chatroom.chatroom.inc
+++ b/chatroom.chatroom.inc
@@ -190,9 +190,12 @@ class Chatroom {
   /**
    * Remove a user from a private chat.
    *
-   * @param mixed $user_to_be_removed
-   * @param mixed $user_doing_the_removing
-   * @return boolean
+   * @param $uid
+   *
+   * @return bool
+   *
+   * @internal param mixed $user_to_be_removed
+   * @internal param mixed $user_doing_the_removing
    */
   public function removeUser($uid) {
     $params = array(
@@ -218,8 +221,7 @@ class Chatroom {
   /**
    * Update the uids allowed to access a chat.
    *
-   * @param mixed $uids
-   * @return void
+   * @internal param mixed $uids
    */
   protected function updateUids() {
     $sql = "DELETE
@@ -236,8 +238,7 @@ class Chatroom {
   /**
    * Update the roles allowed to access a chat.
    *
-   * @param mixed $rids
-   * @return void
+   * @internal param mixed $rids
    */
   protected function updateRids() {
     $sql = "DELETE
@@ -341,8 +342,8 @@ class Chatroom {
    *
    * @param $cmid
    *   Only load messages with cmids less than this value.
-   * @param limit
-   *   The number of messages to return.
+   * @param int $limit
+   *
    * @return array $messages
    *
    */
@@ -364,7 +365,8 @@ class Chatroom {
   /**
    * Load the cmid of the oldest displayed message.
    *
-   * @return $cmid
+   * @return int $cmid
+   *   Loaded message ID.
    */
   public function loadPrevMsgId() {
     $messages = $this->loadLatestMessages();
diff --git a/chatroom.module b/chatroom.module
index fb5cd21..8fb8999 100644
--- a/chatroom.module
+++ b/chatroom.module
@@ -700,6 +700,9 @@ function chatroom_get_user_from_command_arg($command_arg) {
  *
  * @param mixed $message
  * @param mixed $chatroom
+ *
+ * @return mixed
+ *   This return array of $command->callback_result
  */
 function chatroom_call_command($message, $chatroom) {
   $commands = module_invoke_all('chatroom_commands');