diff --git a/README.txt b/README.txt
index 46196d2..0eaa993 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
-********************************************************************************
+***********************************************************************
                      D R U P A L    M O D U L E
-********************************************************************************
+***********************************************************************
 Module Name        : Slideshow Creator
 Original Author    : Bruno Massa http://drupal.org/user/67164
 Maintainer and D7  : Ron House http://drupal.org/user/171604
@@ -8,16 +8,17 @@ General Links:
 Project Page       : http://drupal.org/project/slideshow_creator
 Support Queue      : http://drupal.org/project/issues/slideshow_creator
 
-********************************************************************************
+***********************************************************************
 
 
 DESCRIPTION
 -----------
 
-Slideshow Creator creates a true slideshows using any image over internet with
-many other features. If the user does not have JavaScript enabled, it degrades
-to a "regular" slideshow where the "next" button points to the next image and a
-whole new page is loaded.
+Slideshow Creator creates a true slideshows using any image over
+internet with many other features. If the user does not have
+JavaScript enabled, it degrades to a "regular" slideshow where the
+"next" button points to the next image and a whole new page is
+loaded.
 
 
 FEATURES
@@ -26,8 +27,8 @@ FEATURES
 * CCK: Slideshow Creator has its own widget to CCK
 * Automaticaaly extract images from a given directory
 * Convenient: can be inserted in any node type
-* Customize: add as many images you want, rotate speed and even more than one
-  slideshow per page
+* Customize: add as many images you want, rotate speed and even more
+  than one slideshow per page
 * Lightweight: the JavaScript file is very small
 * Themable: use a CSS to customize the look
 * Usable: JavaScript enhance the slideshow, but it is not required
@@ -40,56 +41,102 @@ USE
 In any node, add the string:
 
 [slideshow:VERSION, rotate=ROTATE_SPEED, blend=BLEND, layout=LAYOUT,
- name=SLIDESHOW_NAME, height=HEIGHT, width=WIDTH,
- img=|IMAGE_URL|LINK|TITLE|DESCRIPTION|TARGET|,
- img=|IMAGE_URL|LINK|TITLE|DESCRIPTION|TARGET|]
+ order=ORDER, name=CLASS_NAME, height=HEIGHT, width=WIDTH,
+ img=|IMAGE_URL|LINK|TITLE|CAPTION|TARGET|,
+ img=|IMAGE_URL|LINK|TITLE|CAPTION|TARGET|]
 
 where:
 VERSION [required]:        the slideshow filter version: currently 2
-ROTATE_SPEED [optional]:   the speed, in seconds, to rotate images (0 to not
-	     		   rotate at all)
-SLIDESHOW_NAME [optional]: you can theme your slideshow thru CSS giving it a
-	       		   class name
+ROTATE_SPEED [optional]:   the speed, in seconds, to rotate images
+	     		   (0 to not rotate at all)
+CLASS_NAME [optional]: 	   you can theme your slideshow thru CSS
+	       		   giving it a class name
 HEIGHT [optional]: 	   all images will be at the same height
 WIDTH [optional]: 	   all images will be at the same width
 BLEND [optional]: 	   how long, in seconds, will take the fading
       			   transaction between images
-LAYOUT [optional]: 	   the buttons, title and description can be displayed
-       			   under several combinations. You can choose between
-			   top, bottom, reverse or default.
-
-then, for each image you want to insert, use:
+LAYOUT [optional]:	   (See below)
+ORDER [optional]:	   (See below)
+
+LAYOUT and ORDER work in tandem, but either or both may be omitted.
+LAYOUT was originally the only option for ordering the pieces of the
+slideshow, but due to a very long-standing bug, not all options were
+distinct. Fixing this would have broken many slideshows that users
+had designed while the bug was in force, so in order to provide all
+the missing options, a new directive, ORDER, was designed so that
+the bug can be removed without changing the behaviour of existing
+slideshows. They now work as follows:
+
+We consider a slideshow to consist of two parts: the slideshow
+proper and the 'next/previous' control line. LAYOUT controls the
+order of these parts:
+
+LAYOUT: takes options 'top', 'bottom', and 'none' (and still
+recognises the buggy old option 'reverse', which is identical to
+'top'):
+
+	top:	the slideshow proper appears above the control line
+	bottom:	the slideshow proper appears below the control line
+	none:	the control line is not displayed
+
+Next, the slideshow itself is considered to consist of three parts,
+a title (usually bolded), a caption, and the image. ORDER controls
+the position of the image relative to the other two parts. The title
+is assumed to normally appear above the caption. ORDER options are:
+
+   	top   	       The image is on top of the title and caption
+	middle	       The image is between the title and caption
+	bottom	       The image is below the title and caption
+	reversetop     As 'top', but the caption is above the title
+	reversemiddle  As 'middle', but the caption is above the title
+	reversebottom  As 'bottom', but the caption is above the title
+
+After specifying the initial options, then for each image you want
+to insert, use an "img=" tag with these fields in this order:
 
 IMAGE_URL [required]:      the image itself
-LINK [optional]: 	   if you want to provide a link to some page, put the
-     			   URL here
+LINK [optional]: 	   if you want to provide a link to some page,
+     			   put the URL here
 TITLE [optional]: 	   often the bold text over the image
-DESCRIPTION [optional]:    often the text under the image
-TARGET [optional]: 	   where the linked page will show: _blank (default)
-       			   will show on another window, _parent and _top is
-			   only used when pages have frames, _self shows on the
-			   very window or you can use a window name.
+CAPTION [optional]:        often the text under the image
+
+TARGET [optional]: 	   where the linked page will show: _blank
+       			   (default) will show on another window,
+       			   _parent and _top is only used when pages
+       			   have frames, _self shows on the very
+       			   window or you can use a window name.
 
 Or you can automatically extract images from a given directory:
 
-You can create a normal slideshow, but you can scan for more images using
-dir=|DIR_IMAGE|DIR_RECURSIVE|DIR_LINK|TITLE|DESCRIPTION|TARGET|
+
+All images in a directory:
+--------------------------
+You can create a normal slideshow, but you can scan for more images
+using
+
+dir=|DIR_IMAGE|DIR_RECURSIVE|DIR_LINK|TITLE|CAPTION|TARGET|
 
 where:
 
-DIR_IMAGE [required]:      the diretory that you want to scan for images. The folder
-	  		   base is the default site files foder, generally
-	  		   "sites/default/files".
-DIR_RECURSIVE [optional]:  "yes" if you want to scan recursively or leave it blank
-DIR_LINK [optional]: 	   "yes" if you want link all images to their own path
-	  		   or leave it blank
-TITLE,DESCRIPTION and TARGET are applied to all images
+DIR_IMAGE [required]:      the diretory that you want to scan for images.
+	  		   The folder base is the default site files
+	  		   foder, generally "sites/default/files".
+
+DIR_RECURSIVE [optional]:  "yes" if you want to scan recursively or
+	      		   leave it blank
+
+DIR_LINK [optional]: 	   "yes" if you want link all images to their own
+	  		   path or leave it blank
+
+TITLE,CAPTION and TARGET are applied to all images
 
 example: (you can copy and paste)
 [slideshow: 2, rotate=2, blend=1,
- img=|http://drupal.org/themes/bluebeach/logos/drupal.org.png|drupal.org|Drupal|The
- ultimate CMS. Download it now!|Drupal|,
- img=|http://www.mysql.com/common/logos/mysql_100x52-64.gif|http://www.mysql.com|MySQL|Free and reliable SQL server and client.|_self|, dir=|/|yes||Generic Photos|Arent they great?||]
+ img=|http://drupal.org/themes/bluebeach/logos/drupal.org.png|
+ drupal.org|Drupal|The ultimate CMS. Download it now!|Drupal|,
+ img=|http://www.mysql.com/common/logos/mysql_100x52-64.gif|
+ http://www.mysql.com|MySQL|Free and reliable SQL server and
+ client.|_self|, dir=|/|yes||Generic Photos|Arent they great?||]
 
 
 ADDITIONAL FEATURES
@@ -137,17 +184,16 @@ options:
     nowrap.
 
 These are described at: http://jquery.malsup.com/cycle/options.html
-Possible values for fx are illustrated at:
-    http://www.malsup.com/jquery/cycle/browser.html
+But note that not all necessarily make sense in the context of the
+display layout as set up by Slideshow Creator. They are not
+supported and you should try them out for yourself to find ones that
+work well.
 
-But note that not all necessarily make sense in the context of the display
-layout as set up by Slideshow Creator. They are not supported and you should
-try them out for yourself to find ones that work well.
+To use them just include them along with the other options at the
+start of the slideshow, for example:
 
-To use them just include them along with the other options at the start of the
-slideshow, for example:
-
-[slideshow: 2, layout=bottom, height=382px, fx=scrollUp, rotate=1, blend=2, ...etc...]
+[slideshow: 2, layout=bottom, height=382px, fx=scrollUp, rotate=1,
+blend=2, ...etc...]
 
 
 INSTALLATION
@@ -156,34 +202,34 @@ INSTALLATION
 2* Activate the module in your Drupal installation.
    Go to administer > site building > modules
 3* Go to administer > site configuration > input formats
-   and add slideshow filter in any filter types your site has.
-   NB: Other filters can interfere with the Slideshow Creator filter
-   (for example "Convert line breaks into HTML" can insert spurious
-   html into the filter and break it). Therefore place this filter
-   early in the list of filters.
+   and add slideshow filter in any filter type your site have.
 
 
 KNOWN ISSUES AND SPECIAL SITUATIONS
 -----------------------------------
-1* the "target" feature is only available thru JavaScript, in order to maintain
-   the page XHTML 1.0 Strict
 
-2* blend feature don't work on Konqueror browser 3.x, unfortunately. Normal on
-   Konqueror 4.x.
+1* the "target" feature is only available thru JavaScript, in order
+   to maintain the page XHTML 1.0 Strict
+
+2* blend feature don't work on Konqueror browser 3.x, unfortunately.
+   Normal on Konqueror 4.x.
 
-3* you want to hide the buttons? put the name=BLABLABLA on [slideshow..] tag
-   and, on CSS, put .BLABLABLA .ssc-previous,.BLABLABLA .ssc-next,.BLABLABLA
-   .ssc-index,.BLABLABLA {display:none;}
+3* The CCK field is known not to work in the Drupal 7 version. Since
+   this is not the critical feature of the module, it is uncertain
+   at present if this will be fixed. If you need it, you are welcome
+   to have a go getting it up and running!
 
 
 DEVELOPMENT
 -----------
 
-If you have suggestions or complains, don't hesitate to post your suggestions
-as an issue on drupal.org.
+If you have suggestions or complains, don't hesitate to post your
+suggestions as an issue on drupal.org. USE THE MODULE ISSUE QUEUE!
+Bug reports added as comments to the how-to page and similar places
+will probably never see the light of day.
 
-If you know PHP and Drupal and want to help on this module, post your code now!
-Translations are also welcome.
+If you know PHP and Drupal and want to help on this module, post
+your code now! Translations are also welcome.
 
-This module was originally sponsored by the brazilian company Titan Atlas
-(titanatlas.com).
+This module was originally sponsored by the brazilian company Titan
+Atlas (titanatlas.com).
diff --git a/slideshow_creator.admin.inc b/slideshow_creator.admin.inc
index 2d9206f..55846ff 100644
--- a/slideshow_creator.admin.inc
+++ b/slideshow_creator.admin.inc
@@ -30,17 +30,31 @@ function _slideshow_creator_admin() {
   );
   $form['layout'] = array(
     '#default_value'  => empty($settings['#layout']) ? 'default' : $settings['#layout'],
-    '#description'    => t('The slideshow layout'),
+    '#description'    => t('The slideshow layout. "Top" puts the slideshow above the control (next-previous) line, and "bottom" does the opposite. "None" removes the controls.'),
     '#options'        => array(
-      'default' => t('Default'),
-      'reverse' => t('Reverse'),
-      'top'     => t('Top'),
-      'bottom'  => t('Bottom'),
-      'none'    => t('None'),
+      'default'       => t('Default'),
+      'top'           => t('Top'),
+      'bottom'        => t('Bottom'),
+      'none'          => t('None'),
     ),
     '#title'          => t('Layout'),
     '#type'           => 'select',
   );
+  $form['order'] = array(
+    '#default_value'  => empty($settings['#order']) ? 'default' : $settings['#order'],
+    '#description'    => t('The order of the slideshow components. "Top" puts the image above the title and caption lines, "middle" puts it in between them, and so on. The "Reverse" options invert the title and caption (putting the caption above the title).'),
+    '#options'        => array(
+      'default'       => t('Default'),
+      'top'           => t('Top'),
+      'middle'        => t('Middle'),
+      'bottom'        => t('Bottom'),
+      'reversetop'    => t('Reverse Top'),
+      'reversemiddle' => t('Reverse Middle'),
+      'reversebottom' => t('Reverse Bottom'),
+    ),
+    '#title'          => t('Order'),
+    '#type'           => 'select',
+  );
   $form['current_slide_string'] = array(
     '#default_value'  => !isset($settings['#current_slide_string']) ? 'Slide' : $settings['#current_slide_string'],
     '#description'    => t('The text to be displayed on the Current Slide part.'),
diff --git a/slideshow_creator.inc b/slideshow_creator.inc
index 789a1d1..288f138 100644
--- a/slideshow_creator.inc
+++ b/slideshow_creator.inc
@@ -116,7 +116,7 @@ function _slideshow_creator_tagconversion(&$max_ss, &$attributes) {
         }
 
         if (trim(drupal_strtolower($attribute[0])) == 'img') {
-	  // img tag: URL|link|title|description|target format
+	  // img tag: URL|link|title|caption|target format
           $img_attributes = explode('|', $attribute[1]);
           if (!empty($img_attributes[1])) {
             $slides['#total']++;
@@ -125,7 +125,7 @@ function _slideshow_creator_tagconversion(&$max_ss, &$attributes) {
               '#src'         => _slideshow_creator_url(check_url(trim($img_attributes[1]))),
               '#link'        => empty($img_attributes[2]) ? '' : _slideshow_creator_url(url($img_attributes[2])),
               '#title'       => empty($img_attributes[3]) ? '' : check_plain(preg_replace('|\\\,|', ',', trim($img_attributes[3]))),
-              '#description' => empty($img_attributes[4]) ? '' : check_plain(preg_replace('|\\\,|', ',', trim($img_attributes[4]))),
+              '#caption' => empty($img_attributes[4]) ? '' : check_plain(preg_replace('|\\\,|', ',', trim($img_attributes[4]))),
               '#target'      => !empty($img_attributes[5]) ? check_plain(trim($img_attributes[5])) : '_blank',
             );
           }
@@ -161,7 +161,7 @@ function _slideshow_creator_tagconversion(&$max_ss, &$attributes) {
                 '#src'         => $file,
                 '#link'        => empty($dir_attributes[3]) ? '' : $file,
                 '#title'       => empty($dir_attributes[4]) ? '' : check_plain(preg_replace('|\\\,|', ',', trim($dir_attributes[4]))),
-                '#description' => empty($dir_attributes[5]) ? '' : check_plain(preg_replace('|\\\,|', ',', trim($dir_attributes[5]))),
+                '#caption' => empty($dir_attributes[5]) ? '' : check_plain(preg_replace('|\\\,|', ',', trim($dir_attributes[5]))),
                 '#target'      => !empty($dir_attributes[6]) ? check_plain(trim($dir_attributes[6])) : '_blank',
               );
             }
@@ -170,6 +170,7 @@ function _slideshow_creator_tagconversion(&$max_ss, &$attributes) {
         else { // all other tags
           $list = array(
             'layout'  => TRUE,
+            'order'   => TRUE,
             'width'   => TRUE,
             'height'  => TRUE,
             'name'    => TRUE,
@@ -259,44 +260,104 @@ function theme_slideshow_creator($variables) {
 
   // This will put the pieces into a given order,
   // base on which "layout" the user chose.
-  if (empty($ss['#layout']) or $ss['#layout'] == 'default') {
-    $layout = array(
+
+  // The 'order' is invented as a tag to overcome a long-standing bug
+  // by which the 'layout' didn't function properly for many years.
+  // Rather than fix it and thereby break everyone's workarounds, we
+  // introduce a new tag, 'order'. 
+  // Order specifies the order of the main pieces of a slideshow:
+  //   Title, Image, and Caption.
+  // The old layout option specifies whether the image is above (top),
+  //   or below (bottom) the controls, or if the controls are absent (none).
+  // If 'order' is absent, 'layout' alone gives the old behaviour.
+
+  $showcontrols = array(
       '#previous',
       '#status',
       '#next',
+  );
+  if (
+    empty($ss['#order']) or
+    $ss['#order'] == 'default' or $ss['#order'] == 'bottom'
+  ) {
+    $showorder = array(
       array(
 	'#title',
+	'#caption',
 	'#main',
-	'#description',
-      ),
+      )
     );
   }
-  elseif ($ss['#layout'] == 'reverse') {
-    $layout = array(
-      array('#title', '#main', '#description'),
-      '#previous',
-      '#status',
-      '#next',
+  elseif ($ss['#order'] == 'middle') {
+    $showorder = array(
+      array(
+	'#title',
+	'#main',
+	'#caption',
+      )
     );
   }
-  elseif ($ss['#layout'] == 'bottom') {
-    $layout = array(
-      '#previous',
-      '#status',
-      '#next',
-      array('#title', '#description', '#main'),
+  elseif ($ss['#order'] == 'top') {
+    $showorder = array(
+      array(
+	'#main',
+	'#title',
+	'#caption',
+      )
     );
   }
-  elseif ($ss['#layout'] == 'top') {
-    $layout = array(
-      array('#main', '#title', '#description'),
-      '#previous',
-      '#status',
-      '#next',
+  elseif ($ss['#order'] == 'reversebottom'
+  ) {
+    $showorder = array(
+      array(
+	'#caption',
+	'#title',
+	'#main',
+      )
+    );
+  }
+  elseif ($ss['#order'] == 'reversemiddle') {
+    $showorder = array(
+      array(
+	'#caption',
+	'#main',
+	'#title',
+      )
     );
   }
+  elseif ($ss['#order'] == 'reversetop') {
+    $showorder = array(
+      array(
+	'#main',
+	'#caption',
+	'#title',
+      )
+    );
+  }
+  else {
+    $showorder = array(
+      array(
+	'#title',
+	'#caption',
+	'#main',
+      )
+    );
+  }
+
+  if (
+    empty($ss['#layout']) or
+    $ss['#layout'] == 'default' or $ss['#layout'] == 'bottom'
+  ) {
+    $layout = array_merge($showcontrols, $showorder);
+  }
+  elseif ($ss['#layout'] == 'top' or $ss['#layout'] == 'reverse') {
+    $layout = array_merge($showorder, $showcontrols);
+  }
   elseif ($ss['#layout'] == 'none') {
-    $layout = array(array('#main', '#title', '#description'));
+    $layout = $showorder;
+  }
+  else {
+    $layout = array_merge($showcontrols, $showorder);
   }
 
   _theme_slideshow_creator_nextprevious($ssid, $ssc, $ss);
@@ -324,9 +385,11 @@ function theme_slideshow_creator($variables) {
     if (is_array($piece)) {
       $output .= "<span id='ssc-content-$ssid' class='ssc-content' style=\"height:$css_height;width:$css_width;\">\n";
       foreach (array_keys($ssc['#content']) as $slide) {
-        $output .= "<span id='ssc-slide-$ssid-$slide' style=\"height:$css_height;width:$css_width;\">\n";
-        foreach ($ssc['#content'][$slide] as $piece2) {
-          $output .= $piece2;
+        $output .= "<span id='ssc-slide-$ssid-$slide'>\n";
+	foreach ($piece as $item) {
+	  if (!empty($ssc['#content'][$slide][$item])) {
+	    $output .= $ssc['#content'][$slide][$item];
+	  }
         }
         $output .= "</span>\n";
       }
@@ -446,7 +509,7 @@ function _theme_slideshow_creator_content($ssid, &$ssc, &$ss) {
 
   $ssc['#content'][] = array(
     '#title'       => "<span class='ssc-title'>$title</span>\n",
-    '#description' => '<span class="ssc-description">' . $ss['#description'] . "</span>\n",
+    '#caption' => '<span class="ssc-description">' . $ss['#caption'] . "</span>\n",
     '#main'        => "<span class='ssc-main'>$main</span>\n",
   );
 }
