diff --git a/feeds.api.php b/feeds.api.php
index 9aee118..af48c0d 100644
--- a/feeds.api.php
+++ b/feeds.api.php
@@ -405,10 +405,6 @@ function my_module_summary_callback(array $mapping, $target, array $form, array
  *
  * The arguments are the same that my_module_summary_callback() gets.
  *
- * @return array
- *   The per mapping configuration form. Once the form is saved, $mapping will
- *   be populated with the form values.
- *
  * @see my_module_summary_callback()
  */
 function my_module_form_callback(array $mapping, $target, array $form, array $form_state) {
diff --git a/includes/FeedsImporter.inc b/includes/FeedsImporter.inc
index 5286b1d..cad7695 100644
--- a/includes/FeedsImporter.inc
+++ b/includes/FeedsImporter.inc
@@ -150,7 +150,7 @@ class FeedsImporter extends FeedsConfigurable {
   /**
    * Copy a FeedsImporter configuration into this importer.
    *
-   * @param FeedsImporter $importer
+   * @param FeedsConfigurable $configurable
    *   The feeds importer object to copy from.
    */
    public function copy(FeedsConfigurable $configurable) {
diff --git a/libraries/ParserCSV.inc b/libraries/ParserCSV.inc
index 4ddc77a..e01fafc 100644
--- a/libraries/ParserCSV.inc
+++ b/libraries/ParserCSV.inc
@@ -151,7 +151,7 @@ class ParserCSV {
   /**
    * Get the byte number where the parser left off after last parse() call.
    *
-   * @return
+   * @return int
    *  0 if all lines or no line has been parsed, the byte position of where a
    *  timeout or the line limit has been reached otherwise. This position can be
    *  used to set the start byte for the next iteration after parse() has
@@ -178,11 +178,8 @@ class ParserCSV {
    *
    * @param Iterator $lineIterator
    *   An Iterator object that yields line strings, e.g. ParserCSVIterator.
-   * @param $start
-   *   The byte number from where to start parsing the file.
-   * @param $lines
-   *   The number of lines to parse, 0 for all lines.
-   * @return
+   *
+   * @return array
    *   Two dimensional array that contains the data in the CSV file.
    */
   public function parse(Iterator $lineIterator) {
diff --git a/libraries/common_syndication_parser.inc b/libraries/common_syndication_parser.inc
index d37599f..71a5c49 100644
--- a/libraries/common_syndication_parser.inc
+++ b/libraries/common_syndication_parser.inc
@@ -13,9 +13,10 @@
 /**
  * Parse the feed into a data structure.
  *
- * @param $feed
+ * @param $string
  *  The feed object (contains the URL or the parsed XML structure.
- * @return
+ *
+ * @return array|bool
  *  stdClass The structured datas extracted from the feed.
  */
 function common_syndication_parser_parse($string) {
@@ -43,7 +44,8 @@ function common_syndication_parser_parse($string) {
  *
  * @param $xml
  *  SimpleXML-preprocessed feed.
- * @return
+ *
+ * @return string|bool
  *  The feed format short description or FALSE if not compatible.
  */
 function _parser_common_syndication_feed_format_detect($xml) {
@@ -478,9 +480,10 @@ function _parser_common_syndication_RSS20_parse($feed_XML) {
 /**
  * Parse a date comes from a feed.
  *
- * @param $date_string
+ * @param $date_str
  *  The date string in various formats.
- * @return
+ *
+ * @return bool|int
  *  The timestamp of the string or the current time if can't be parsed
  */
 function _parser_common_syndication_parse_date($date_str) {
@@ -516,7 +519,8 @@ function _parser_common_syndication_parse_date($date_str) {
  *
  * @param $date_str
  *   A string with a potentially W3C DTF date.
- * @return
+ *
+ * @return bool|int
  *   A timestamp if parsed successfully or FALSE if not.
  */
 function _parser_common_syndication_parse_w3cdtf($date_str) {
@@ -553,6 +557,8 @@ function _parser_common_syndication_parse_w3cdtf($date_str) {
  *
  * @param $links
  *  Array of SimpleXML objects
+ *
+ * @return string
  */
 function _parser_common_syndication_link($links) {
   $to_link = '';
diff --git a/libraries/opml_parser.inc b/libraries/opml_parser.inc
index d1faefc..c5b7cb3 100644
--- a/libraries/opml_parser.inc
+++ b/libraries/opml_parser.inc
@@ -10,7 +10,8 @@
  *
  * @param $raw
  *   File contents.
- * @return
+ *
+ * @return array
  *   An array of the parsed OPML file.
  */
 function opml_parser_parse($raw) {
diff --git a/plugins/FeedsCSVParser.inc b/plugins/FeedsCSVParser.inc
index 8fa11b0..2d4f1f3 100644
--- a/plugins/FeedsCSVParser.inc
+++ b/plugins/FeedsCSVParser.inc
@@ -56,7 +56,7 @@ class FeedsCSVParser extends FeedsParser {
    *
    * @param ParserCSV $parser
    * @param ParserCSVIterator $iterator
-   * @return
+   * @return mixed|bool
    *   An array of lower-cased column names to use as keys for the parsed items.
    */
   protected function parseHeader(ParserCSV $parser, ParserCSVIterator $iterator) {
@@ -77,7 +77,9 @@ class FeedsCSVParser extends FeedsParser {
    *
    * @param ParserCSV $parser
    * @param ParserCSVIterator $iterator
-   * @return
+   * @param int $start
+   * @param int $limit
+   * @return array
    *   An array of rows of the CSV keyed by the column names previously set
    */
   protected function parseItems(ParserCSV $parser, ParserCSVIterator $iterator, $start = 0, $limit = 0) {