diff -u b/addons/nodequeue_service/nodequeue_service.inc b/addons/nodequeue_service/nodequeue_service.inc
--- b/addons/nodequeue_service/nodequeue_service.inc
+++ b/addons/nodequeue_service/nodequeue_service.inc
@@ -10,7 +10,7 @@
 /**
  * Returns an array of available nodequeue "channels" available.
  * @return array
- * array with key of nodequeue ids and all settings within
+ *   array with key of nodequeue ids and all settings within
  */
 function nodequeue_service_get_nodequeues() {
   if (module_exists('nodequeue')) {
diff -u b/nodequeue.module b/nodequeue.module
--- b/nodequeue.module
+++ b/nodequeue.module
@@ -1348,7 +1348,7 @@
  * @param null $size
  *
  * @internal param $reference
- *   The subqueue to check.*   The subqueue to check.
+ *   The subqueue to check.
  */
 function nodequeue_check_subqueue_size($queue, &$subqueue, $size = NULL) {
   if (!isset($size)) {
@@ -2006,7 +2006,7 @@
  *   The string being matched.
  *
  * @return array
- * An keyed array $nid => $title
+ *   An keyed array $nid => $title
  */
 function nodequeue_api_autocomplete($queue, $subqueue, $string) {
   $matches = array();
@@ -2128,7 +2128,7 @@
  *   An array of additional items to add to the query.
  *
  * @return array|string
- * The query string suitable for use in the l() function.
+ *   The query string suitable for use in the l() function.
  */
 function nodequeue_get_query_string($seed, $destination = FALSE, $query = array()) {
   $dest = drupal_get_destination();
diff -u b/nodequeue.rules.inc b/nodequeue.rules.inc
--- b/nodequeue.rules.inc
+++ b/nodequeue.rules.inc
@@ -217,9 +217,9 @@
  *   boolean indicating whether the conditions applies
  *
  * @internal param $nodequeue
- *   nodequeue (subqueue) object*   nodequeue (subqueue) object
+ *   nodequeue (subqueue) object
  * @internal param $qid
- *   list of nodequeue ID's*   list of nodequeue ID's
+ *   list of nodequeue ID's
  */
 function nodequeue_rules_condition_node_belongs_to_nodequeue($node, $qids) {
   $queues = nodequeue_load_queues(array_keys($qids));
diff -u b/nodequeue_generate.drush.inc b/nodequeue_generate.drush.inc
--- b/nodequeue_generate.drush.inc
+++ b/nodequeue_generate.drush.inc
@@ -11,7 +11,7 @@
  * @See drush_parse_command() for a list of recognized keys.
  *
  * @return array
- * An associative array describing your command(s).
+ *   An associative array describing your command(s).
  */
 function nodequeue_generate_drush_command() {
   $items = array();
diff -u b/tests/nodequeue.test b/tests/nodequeue.test
--- b/tests/nodequeue.test
+++ b/tests/nodequeue.test
@@ -21,7 +21,7 @@
    *   Link position counting from zero.
    *
    * @return bool
-   * Page on success, or FALSE on failure.
+   *   Page on success, or FALSE on failure.
    */
   protected function clickImage($label, $index = 0) {
     $url_before = $this->getUrl();
@@ -50,9 +50,10 @@
    * @param string $owner
    *
    * @return object
-   * A nodequeue object.
+   *   A nodequeue object.
    *
-   * @internal param int $rid The role ID allowed to manipulate this queue.*   The role ID allowed to manipulate this queue.
+   * @internal param int $rid
+   *   The role ID allowed to manipulate this queue.
    */
   function createNodequeue($types, $rids = array(2), $size = 10, $reverse = FALSE, $owner = 'nodequeue') {
     $queue = new stdClass();