diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 51291532..2677a733 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,5 +1,10 @@
-0.2.0 (Jan 19, 2009)
+0.2.1 (Jan 19, 2009)
+* Add sample data for Tags and Taggings. Remove sample data for Comments.
+
+* Rake tasks: update to work with edge Spree. fix outdated extension name.
 
+
+0.2.0 (Jan 19, 2009)
 * BACKWARDS INCOMPATIBLE: Update compatibility with Spree 0.9.99 by moving admin_tabs to hook
 
 * Rewrite news archive widget - see issue #1
@@ -15,4 +20,4 @@
 
 0.1.0 (Jan 18, 2009)
 
-* initial release
+* Initial release
diff --git a/blogging_spree_extension.rb b/blogging_spree_extension.rb
index 03201ac4..cc821fef 100644
--- a/blogging_spree_extension.rb
+++ b/blogging_spree_extension.rb
@@ -2,7 +2,7 @@
 # require_dependency 'application'
 
 class BloggingSpreeExtension < Spree::Extension
-  version "0.2.0"
+  version "0.2.1"
   description "BloggingSpree: A Spree blogging solution"
   url "git://github.com/jaymendoza/spree-blogging-spree.git"
 
diff --git a/db/sample/blog_entries.yml b/db/sample/blog_entries.yml
index 123c79b3..2537ec54 100644
--- a/db/sample/blog_entries.yml
+++ b/db/sample/blog_entries.yml
@@ -1,20 +1,13 @@
-blog_1:
-  author: bill 
+---
+blog_entry_001:
   title: a first blog entry
-  body: some short text 
-blog_2:
-  author: joe 
+  body: some text
+  permalink: a-first-blog-entry
+blog_entry_002:
   title: a second blog entry
-  body: some long text with code *RUB-00001* as sku
-blog_3:
-  author: bill
+  body: some text
+  permalink: a-second-blog-entry
+blog_entry_003:
   title: a third blog entry
-  body: some long text with code *RUB-00001* as sku
-blog_4:
-  author: joe 
-  title: a fourth blog entry with a longer title
-  body: several references to *RUB-00001* and to *APC-00001* and to *ROR-00006* and why not to *ROR-00009*
-blog_5:
-  author: joe 
-  title: a fifth blog entry 
-  body: several references to *RUB-00001* and to *APC-00001* and to *ROR-00006* and why not to *ROR-00009*
+  body: some text
+  permalink: a-third-blog-entry
diff --git a/db/sample/comments.yml b/db/sample/comments.yml
deleted file mode 100644
index b37c36de..00000000
--- a/db/sample/comments.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-comment_1:
-  user: frank
-  blog_entry: blog_1
-  name: frank one
-  uri: "http://google.com"
-  body: I completely agree
-  approved: true
-comment_2:
-  user: frank
-  blog_entry: blog_1
-  name: frank two no uri
-  uri: 
-  body: I absolutely disagree
-  approved: true
-comment_3:
-  user: frank
-  blog_entry: blog_1
-  name: frank three
-  uri: "http://google.com"
-  body: I completely agree again
-  approved: false
-comment_4:
-  user: frank
-  blog_entry: blog_1
-  name: frank one
-  uri: "http://google.com"
-  body: I am not sure now
-  approved: true
-comment_5:
-  user: frank
-  blog_entry: blog_2
-  name: frank on two
-  uri: "http://google.com"
-  body: Right on! I like the gear.
-  approved: true
-comment_6:
-  user: frank
-  blog_entry: blog_3
-  name: frank on three
-  uri: "http://google.com"
-  body: I liked these so much I bought the company
-  approved: true
diff --git a/db/sample/taggings.yml b/db/sample/taggings.yml
new file mode 100644
index 00000000..c80e41e9
--- /dev/null
+++ b/db/sample/taggings.yml
@@ -0,0 +1,30 @@
+---
+tagging_001:
+  tag: tag_001
+  taggable_type: BlogEntry
+  taggable: blog_entry_001
+
+tagging_002:
+  tag: tag_001
+  taggable_type: BlogEntry
+  taggable: blog_entry_002
+
+tagging_003:
+  tag: tag_002
+  taggable_type: BlogEntry
+  taggable: blog_entry_002
+
+tagging_004:
+  tag: tag_001
+  taggable_type: BlogEntry
+  taggable: blog_entry_003
+
+tagging_005:
+  tag: tag_002
+  taggable_type: BlogEntry
+  taggable: blog_entry_003
+
+tagging_006:
+  tag: tag_003
+  taggable_type: BlogEntry
+  taggable: blog_entry_003
diff --git a/db/sample/tags.yml b/db/sample/tags.yml
new file mode 100644
index 00000000..2e243708
--- /dev/null
+++ b/db/sample/tags.yml
@@ -0,0 +1,10 @@
+---
+tag_001:
+  name: foo
+  kind: tag
+tag_002:
+  name: bar
+  kind: tag
+tag_003:
+  name: baz
+  kind: tag