diff --git a/tracks/app/helpers/todos_helper.rb b/tracks/app/helpers/todos_helper.rb
index bdf5aa55..c6dc966c 100644
--- a/tracks/app/helpers/todos_helper.rb
+++ b/tracks/app/helpers/todos_helper.rb
@@ -67,6 +67,10 @@ module TodosHelper
     end    
   end
   
+  def tag_list_text
+    @todo.tags.collect{|t| t.name}.join(', ')
+  end
+  
   def tag_list
     tag_list = @todo.tags.reject{|t| t.name == Todo::STARRED_TAG_NAME}.collect{|t| "<span class=\"tag\">" + link_to(t.name, :action => "tag", :id => t.name) + "</span>"}.join('')
     "<span class='tags'>#{tag_list}</span>"
diff --git a/tracks/app/views/todos/_edit_form.rhtml b/tracks/app/views/todos/_edit_form.rhtml
index d6be00d8..73930f6d 100644
--- a/tracks/app/views/todos/_edit_form.rhtml
+++ b/tracks/app/views/todos/_edit_form.rhtml
@@ -43,7 +43,7 @@ Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "click", <%= dom_id(@to
 </div>
 
 <label class="tag_list_label" for="<%= dom_id(@todo, 'tag_list') %>">Tags (separate with commas)</label>
-<%= text_field_tag dom_id(@todo, 'tag_list'), nil, :size => 30, :tabindex => 12 %> 
+<%= text_field_tag 'tag_list', tag_list_text, :id => dom_id(@todo, 'tag_list'), :size => 30, :tabindex => 12 %> 
 
 <div class="due_input">
 <label for="<%= dom_id(@todo, 'due') %>">Due</label>
diff --git a/tracks/db/schema.rb b/tracks/db/schema.rb
index 5f0d0b46..eff04e23 100644
--- a/tracks/db/schema.rb
+++ b/tracks/db/schema.rb
@@ -2,13 +2,26 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 32) do
+ActiveRecord::Schema.define(:version => 0) do
+
+  create_table "bow_wows", :force => true do |t|
+    t.column "name",       :string
+    t.column "created_at", :datetime, :null => false
+    t.column "updated_at", :datetime, :null => false
+  end
+
+  create_table "cats", :force => true do |t|
+    t.column "name",       :string
+    t.column "cat_type",   :string
+    t.column "created_at", :datetime, :null => false
+    t.column "updated_at", :datetime, :null => false
+  end
 
   create_table "contexts", :force => true do |t|
-    t.column "name",       :string,   :default => "",    :null => false
-    t.column "position",   :integer,                     :null => false
-    t.column "hide",       :boolean,  :default => false
-    t.column "user_id",    :integer,  :default => 1
+    t.column "name",       :string,                :default => "", :null => false
+    t.column "hide",       :integer,  :limit => 4, :default => 0,  :null => false
+    t.column "position",   :integer,               :default => 0,  :null => false
+    t.column "user_id",    :integer,               :default => 0,  :null => false
     t.column "created_at", :datetime
     t.column "updated_at", :datetime
   end
@@ -16,9 +29,48 @@ ActiveRecord::Schema.define(:version => 32) do
   add_index "contexts", ["user_id"], :name => "index_contexts_on_user_id"
   add_index "contexts", ["user_id", "name"], :name => "index_contexts_on_user_id_and_name"
 
+  create_table "eaters_foodstuffs", :force => true do |t|
+    t.column "foodstuff_id",   :integer
+    t.column "eater_id",       :integer
+    t.column "some_attribute", :integer,  :default => 0
+    t.column "eater_type",     :string
+    t.column "created_at",     :datetime,                :null => false
+    t.column "updated_at",     :datetime,                :null => false
+  end
+
+  create_table "fish", :force => true do |t|
+    t.column "name",       :string
+    t.column "speed",      :integer
+    t.column "created_at", :datetime, :null => false
+    t.column "updated_at", :datetime, :null => false
+  end
+
+  create_table "frogs", :force => true do |t|
+    t.column "name",       :string
+    t.column "created_at", :datetime, :null => false
+    t.column "updated_at", :datetime, :null => false
+  end
+
+  create_table "keep_your_enemies_close", :force => true do |t|
+    t.column "enemy_id",       :integer
+    t.column "enemy_type",     :string
+    t.column "protector_id",   :integer
+    t.column "protector_type", :string
+    t.column "created_at",     :datetime, :null => false
+    t.column "updated_at",     :datetime, :null => false
+  end
+
+  create_table "little_whale_pupils", :force => true do |t|
+    t.column "whale_id",           :integer
+    t.column "aquatic_pupil_id",   :integer
+    t.column "aquatic_pupil_type", :string
+    t.column "created_at",         :datetime, :null => false
+    t.column "updated_at",         :datetime, :null => false
+  end
+
   create_table "notes", :force => true do |t|
-    t.column "user_id",    :integer,  :null => false
-    t.column "project_id", :integer,  :null => false
+    t.column "user_id",    :integer,  :default => 0, :null => false
+    t.column "project_id", :integer,  :default => 0, :null => false
     t.column "body",       :text
     t.column "created_at", :datetime
     t.column "updated_at", :datetime
@@ -43,8 +95,15 @@ ActiveRecord::Schema.define(:version => 32) do
     t.column "value",   :binary
   end
 
+  create_table "petfoods", :id => false, :force => true do |t|
+    t.column "the_petfood_primary_key", :integer,  :null => false
+    t.column "name",                    :string
+    t.column "created_at",              :datetime, :null => false
+    t.column "updated_at",              :datetime, :null => false
+  end
+
   create_table "preferences", :force => true do |t|
-    t.column "user_id",                            :integer,                                                           :null => false
+    t.column "user_id",                            :integer,               :default => 0,                              :null => false
     t.column "date_format",                        :string,  :limit => 40, :default => "%d/%m/%Y",                     :null => false
     t.column "week_starts",                        :integer,               :default => 0,                              :null => false
     t.column "show_number_completed",              :integer,               :default => 5,                              :null => false
@@ -66,8 +125,8 @@ ActiveRecord::Schema.define(:version => 32) do
 
   create_table "projects", :force => true do |t|
     t.column "name",               :string,                 :default => "",       :null => false
-    t.column "position",           :integer,                                      :null => false
-    t.column "user_id",            :integer,                :default => 1
+    t.column "position",           :integer,                :default => 0,        :null => false
+    t.column "user_id",            :integer,                :default => 0,        :null => false
     t.column "description",        :text
     t.column "state",              :string,   :limit => 20, :default => "active", :null => false
     t.column "created_at",         :datetime
@@ -84,7 +143,7 @@ ActiveRecord::Schema.define(:version => 32) do
     t.column "updated_at", :datetime
   end
 
-  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+  add_index "sessions", ["session_id"], :name => "sessions_session_id_index"
 
   create_table "taggings", :force => true do |t|
     t.column "taggable_id",   :integer
@@ -104,16 +163,16 @@ ActiveRecord::Schema.define(:version => 32) do
   add_index "tags", ["name"], :name => "index_tags_on_name"
 
   create_table "todos", :force => true do |t|
-    t.column "context_id",   :integer,                                         :null => false
-    t.column "project_id",   :integer
-    t.column "description",  :string,                 :default => "",          :null => false
+    t.column "context_id",   :integer,                 :default => 0,           :null => false
+    t.column "description",  :string,   :limit => 100, :default => "",          :null => false
     t.column "notes",        :text
     t.column "created_at",   :datetime
     t.column "due",          :date
     t.column "completed_at", :datetime
-    t.column "user_id",      :integer,                :default => 1
+    t.column "project_id",   :integer
+    t.column "user_id",      :integer,                 :default => 0,           :null => false
     t.column "show_from",    :date
-    t.column "state",        :string,   :limit => 20, :default => "immediate", :null => false
+    t.column "state",        :string,   :limit => 20,  :default => "immediate", :null => false
   end
 
   add_index "todos", ["user_id", "state"], :name => "index_todos_on_user_id_and_state"
@@ -123,10 +182,10 @@ ActiveRecord::Schema.define(:version => 32) do
   add_index "todos", ["user_id", "context_id"], :name => "index_todos_on_user_id_and_context_id"
 
   create_table "users", :force => true do |t|
-    t.column "login",       :string,  :limit => 80, :default => "",         :null => false
-    t.column "password",    :string,  :limit => 40, :default => "",         :null => false
+    t.column "login",       :string,  :limit => 80
+    t.column "password",    :string,  :limit => 40
     t.column "word",        :string
-    t.column "is_admin",    :boolean,               :default => false,      :null => false
+    t.column "is_admin",    :integer, :limit => 4,  :default => 0,          :null => false
     t.column "first_name",  :string
     t.column "last_name",   :string
     t.column "auth_type",   :string,                :default => "database", :null => false
@@ -135,4 +194,16 @@ ActiveRecord::Schema.define(:version => 32) do
 
   add_index "users", ["login"], :name => "index_users_on_login"
 
+  create_table "whales", :force => true do |t|
+    t.column "name",       :string
+    t.column "created_at", :datetime, :null => false
+    t.column "updated_at", :datetime, :null => false
+  end
+
+  create_table "wild_boars", :force => true do |t|
+    t.column "name",       :string
+    t.column "created_at", :datetime, :null => false
+    t.column "updated_at", :datetime, :null => false
+  end
+
 end