diff --git a/bin/kag-server b/bin/kag-server
index 42a7392..72aef7f 100755
--- a/bin/kag-server
+++ b/bin/kag-server
@@ -4,7 +4,7 @@ require 'bundler/setup'
 
 lib_path = File.expand_path('lib')
 
-if File.exists? lib_path
+if File.directory? lib_path
   $LOAD_PATH.unshift lib_path
 end
 
diff --git a/kag-gather.gemspec b/kag-gather.gemspec
index 3a26e1b..4f58904 100644
--- a/kag-gather.gemspec
+++ b/kag-gather.gemspec
@@ -16,6 +16,9 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version     = '>= 1.9.2'
   gem.required_rubygems_version = '>= 1.3.6'
 
+  gem.executables = ['kag-gather','kag-server']
+  gem.default_executable = 'kag-gather'
+
   gem.files        = Dir['readme.md', 'lib/**/*', 'config/config.sample.json']
   gem.require_path = 'lib'
 
diff --git a/lib/server.rb b/lib/server.rb
index fdebcc0..c3678a2 100644
--- a/lib/server.rb
+++ b/lib/server.rb
@@ -11,7 +11,7 @@
 
 env = KAG::Config.instance[:branch].to_sym
 set :environment, env
-set :root, File.dirname(__FILE__)+'/lib'
+set :root, File.dirname(__FILE__)+'/'
 
 if env == :production
   set :logging, false
@@ -20,18 +20,18 @@
 set :server, %w[thin mongrel webrick]
 set :port, 50313
 
-get "/*" do
+get '/*' do
   KAG::API::Controller::Base.route('get',params)
 end
 
-post "/*" do
+post '/*' do
   KAG::API::Controller::Base.route('post',params)
 end
 
-put "/*" do
+put '/*' do
   KAG::API::Controller::Base.route('put',params)
 end
 
-delete "/*" do
+delete '/*' do
   KAG::API::Controller::Base.route('delete',params)
 end