diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a4a5beac5..84bb1944b 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -88,6 +88,8 @@
  - fix [ 1432491 ] 6.8.6 popup windows has not head & body tags
  - fixed a bug in the File asset that caused file redirects to be cached
    incorrectly for Visitor.  Thanks to Jukka Raimovaara / Axxion Oy.
+ - fix [ 1454694 ] Children of a folder not linking correctly
+ - fix [ 1454684 ] Folder listing every asset
 
 6.8.7
  - fix [ 1431098 ] op=becomeUser can become non-existent userIds
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 89095614e..4ba42a53f 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -135,6 +135,7 @@ sub view {
 				id => $child->getId,
 				url => $child->getUrl,
 				title => $child->get("title"),
+				canView => $child->canView(),
 				"icon.small"=>$child->getIcon(1),
 				"icon.big"=>$child->getIcon
 				});
@@ -145,6 +146,7 @@ sub view {
 			my $file = $child->getFileUrl if ($isFile);
 			push(@{$vars{"file_loop"}},{
 				id=>$child->getId,
+				canView => $child->canView(),
 				title=>$child->get("title"),
 				synopsis=>$child->get("synopsis"),
 				size=>WebGUI::Utility::formatBytes($child->get("assetSize")),
diff --git a/lib/WebGUI/i18n/English/Asset_Folder.pm b/lib/WebGUI/i18n/English/Asset_Folder.pm
index 2375b485c..ef571c332 100644
--- a/lib/WebGUI/i18n/English/Asset_Folder.pm
+++ b/lib/WebGUI/i18n/English/Asset_Folder.pm
@@ -57,6 +57,12 @@ The url of the Folder.
 <p><b>title</b><br>
 The title of the Folder.
 
+<p><b>icon.small</b><br>
+The URL to a small icon of the appropriate type for this Asset.
+
+<p><b>icon.big</b><br>
+The URL to a big icon of the appropriate type for this Asset.
+
 </blockquote>
 
 <p><b>file_loop</b><br>
@@ -67,6 +73,9 @@ A loop containing all non-Folder assets which are children of the Folder.
 <p><b>id</b><br>
 The assetId of the Asset.
 
+<p><b>canView</b><br>
+A conditional indicating if the current user can view this Asset.
+
 <p><b>title</b><br>
 The title of the Asset.
 
@@ -94,14 +103,21 @@ The URL of the Asset.
 <p><b>isImage</b><br>
 A conditional indicating if this Asset is an Image Asset.
 
-<p><b>thumbnail.url</b><br>
-If this Asset is an Image, the URL to the thumbnail for it.
+<p><b>canEdit</b><br>
+A conditional indicating if this Asset can be edited by the current user.
+
+<p><b>controls</b><br>
+The editing control bar for this child
 
 <p><b>isFile</b><br>
 A conditional indicating if this Asset is a File Asset.
 
+<p><b>thumbnail.url</b><br>
+If this Asset is an Image, the URL to the thumbnail for it.
+
 <p><b>file.url</b><br>
-If this Asset is a File, the URL to the actual file for downloading.
+If this Asset is a File Asset (File, Image or Zip Archive), the URL to the actual file for downloading.  Otherwise,
+this variable will be empty
 
 </blockquote>
 		|,