diff --git a/tracks/app/controllers/contexts_controller.rb b/tracks/app/controllers/contexts_controller.rb
index 5351fe7f..05fc3c5b 100644
--- a/tracks/app/controllers/contexts_controller.rb
+++ b/tracks/app/controllers/contexts_controller.rb
@@ -100,7 +100,7 @@ class ContextsController < ApplicationController
     def check_user_set_context
       if params['url_friendly_name']
         @context = @user.contexts.find_by_url_friendly_name(params['url_friendly_name'])
-      elsif params['id'] && params['id'] =~ /\d+/
+      elsif params['id'] && params['id'] =~ /^\d+$/
         @context = @user.contexts.find(params['id'])
       elsif params['id']
         @context = @user.contexts.find_by_url_friendly_name(params['id'])
diff --git a/tracks/app/controllers/note_controller.rb b/tracks/app/controllers/note_controller.rb
index 5614aafb..46c6bbbd 100644
--- a/tracks/app/controllers/note_controller.rb
+++ b/tracks/app/controllers/note_controller.rb
@@ -16,7 +16,7 @@ class NoteController < ApplicationController
 
   # Add a new note to this project
   #
-  def add
+  def create
     note = @user.notes.build
     note.attributes = params["new_note"]
 
diff --git a/tracks/app/controllers/projects_controller.rb b/tracks/app/controllers/projects_controller.rb
index f0f75431..b3f3dd8f 100644
--- a/tracks/app/controllers/projects_controller.rb
+++ b/tracks/app/controllers/projects_controller.rb
@@ -115,7 +115,7 @@ class ProjectsController < ApplicationController
     def check_user_set_project
       if params["url_friendly_name"]
         @project = @user.projects.find_by_url_friendly_name(params["url_friendly_name"])
-      elsif params['id'] && params['id'] =~ /\d+/
+      elsif params['id'] && params['id'] =~ /^\d+$/
         @project = @user.projects.find(params["id"])
       elsif params['id']
         @project = @user.projects.find_by_url_friendly_name(params["id"])
diff --git a/tracks/app/views/projects/show.rhtml b/tracks/app/views/projects/show.rhtml
index df4af22f..ff54f877 100644
--- a/tracks/app/views/projects/show.rhtml
+++ b/tracks/app/views/projects/show.rhtml
@@ -18,7 +18,7 @@
 <div>
 
 	<div id="new-note" style="display:none;">
-	<% form_remote_tag :url => { :controller => "note", :action => "add" },
+	<% form_remote_tag :url => { :controller => "note", :action => "create" },
 	                    :update => "notes",
 	                    :position => "bottom",
 	                    :complete => "new Effect.Highlight('notes');$('empty-n').hide();",
diff --git a/tracks/config/routes.rb b/tracks/config/routes.rb
index 48dab5fe..f3602415 100644
--- a/tracks/config/routes.rb
+++ b/tracks/config/routes.rb
@@ -45,7 +45,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'projects/feed/:feedtype/:login/:token', :controller => 'feed', :action => 'list_projects_only'
 
   # Notes Routes
-  map.connect 'note/add', :controller => 'note', :action => 'add'
+  map.connect 'note/create', :controller => 'note', :action => 'create'
   map.connect 'note/update/:id', :controller => 'note', :action => 'update', :id => 'id'
   map.connect 'note/:id', :controller => 'note', :action => 'show', :id => 'id'
   map.connect 'notes', :controller => 'note', :action => 'index'