diff --git a/tracks/db/schema.rb b/tracks/db/schema.rb
index 4aa51d54..72a905f3 100644
--- a/tracks/db/schema.rb
+++ b/tracks/db/schema.rb
@@ -5,10 +5,10 @@
 ActiveRecord::Schema.define(:version => 36) do
 
   create_table "contexts", :force => true do |t|
-    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 "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 "created_at", :datetime
     t.column "updated_at", :datetime
   end
@@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 36) do
   add_index "contexts", ["user_id", "name"], :name => "index_contexts_on_user_id_and_name"
 
   create_table "notes", :force => true do |t|
-    t.column "user_id",    :integer,  :default => 0, :null => false
-    t.column "project_id", :integer,  :default => 0, :null => false
+    t.column "user_id",    :integer,  :null => false
+    t.column "project_id", :integer,  :null => false
     t.column "body",       :text
     t.column "created_at", :datetime
     t.column "updated_at", :datetime
@@ -44,7 +44,7 @@ ActiveRecord::Schema.define(:version => 36) do
   end
 
   create_table "preferences", :force => true do |t|
-    t.column "user_id",                            :integer,               :default => 0,                              :null => false
+    t.column "user_id",                            :integer,                                                           :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 +66,8 @@ ActiveRecord::Schema.define(:version => 36) do
 
   create_table "projects", :force => true do |t|
     t.column "name",               :string,                 :default => "",       :null => false
-    t.column "position",           :integer,                :default => 0,        :null => false
-    t.column "user_id",            :integer,                :default => 0,        :null => false
+    t.column "position",           :integer,                                      :null => false
+    t.column "user_id",            :integer,                :default => 1
     t.column "description",        :text
     t.column "state",              :string,   :limit => 20, :default => "active", :null => false
     t.column "created_at",         :datetime
@@ -85,7 +85,7 @@ ActiveRecord::Schema.define(:version => 36) do
     t.column "updated_at", :datetime
   end
 
-  add_index "sessions", ["session_id"], :name => "sessions_session_id_index"
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
 
   create_table "taggings", :force => true do |t|
     t.column "taggable_id",   :integer
@@ -105,16 +105,16 @@ ActiveRecord::Schema.define(:version => 36) do
   add_index "tags", ["name"], :name => "index_tags_on_name"
 
   create_table "todos", :force => true do |t|
-    t.column "context_id",   :integer,                 :default => 0,           :null => false
-    t.column "description",  :string,   :limit => 100, :default => "",          :null => false
+    t.column "context_id",   :integer,                                         :null => false
+    t.column "project_id",   :integer
+    t.column "description",  :string,                 :default => "",          :null => false
     t.column "notes",        :text
     t.column "created_at",   :datetime
     t.column "due",          :date
     t.column "completed_at", :datetime
-    t.column "project_id",   :integer
-    t.column "user_id",      :integer,                 :default => 0,           :null => false
+    t.column "user_id",      :integer,                :default => 1
     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"
@@ -124,10 +124,10 @@ ActiveRecord::Schema.define(:version => 36) 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
+    t.column "login",                     :string,   :limit => 80, :default => "",         :null => false
     t.column "crypted_password",          :string,   :limit => 40
     t.column "token",                     :string
-    t.column "is_admin",                  :integer,  :limit => 4,  :default => 0,          :null => false
+    t.column "is_admin",                  :boolean,                :default => false,      :null => false
     t.column "first_name",                :string
     t.column "last_name",                 :string
     t.column "auth_type",                 :string,                 :default => "database", :null => false