diff --git a/site/_config.yml b/site/_config.yml
index d9b77c3..b014d07 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -1,8 +1,8 @@
 name: "Accumulo-Pig"
 description: "Using Apache Accumulo as a storage engine for Apache Pig"
 
-#url: http://people.apache.org/~elserj/accumulo-pig/
-url: http://localhost:4000
+url: http://people.apache.org/~elserj/accumulo-pig/
+#url: http://localhost:4000
 
 pygments: true
 auto: true
diff --git a/site/_layouts/default.html b/site/_layouts/default.html
index 40824ce..ef4f96e 100644
--- a/site/_layouts/default.html
+++ b/site/_layouts/default.html
@@ -5,7 +5,7 @@
         <title>{{ page.title }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-        <link href="/css/base.css" rel="stylesheet" type="text/css" />
+        <link href="{{ site.url }}/css/base.css" rel="stylesheet" type="text/css" />
 
         <!--script type="text/javascript">
             var _gaq = _gaq || [];
@@ -25,7 +25,7 @@
         <div id="content">
             <div id="header">
                 <span class="h1">{% if page.title %} {{ page.title }} {% else %} Accumulo storage with Pig {% endif %}</span>
-                <span style="float:right;"><img src="/images/pig.gif" height="70px" alt="pig" /><img src="/images/accumulo.png" height="70px" alt="accumulo" style="padding-left:15px"/></span>
+                <span style="float:right;"><img src="{{ site.url }}/images/pig.gif" height="70px" alt="pig" /><img src="{{ site.url }}/images/accumulo.png" height="70px" alt="accumulo" style="padding-left:15px"/></span>
             </div>
             {{ content }}
         </div>
diff --git a/site/docs/flight-example.md b/site/docs/flight-example.md
index bf378b1..ca92793 100644
--- a/site/docs/flight-example.md
+++ b/site/docs/flight-example.md
@@ -135,3 +135,5 @@
 2000-01-01_AA_10 taxi_in: []    8
 2000-01-01_AA_10 taxi_out: []    17
 </pre>
+
+Considerations on [future work]({{site.url}}/docs/future-work).
diff --git a/site/docs/introduction.md b/site/docs/introduction.md
index 19b2cb6..1cc1715 100644
--- a/site/docs/introduction.md
+++ b/site/docs/introduction.md
@@ -52,4 +52,4 @@
 document-partitioned indexes, and edge lists to name a few. All of these can be expressed using the same "5 tuple" Key
 data model that Accumulo provides.
 
-Next, how to [use Pig to manipulate "map in row" datasets in Accumulo](/docs/map-storage).
+Next, how to [use Pig to manipulate "map in row" datasets in Accumulo]({{site.url}}/docs/map-storage).
diff --git a/site/docs/key-value-storage.md b/site/docs/key-value-storage.md
index 6b40c3b..d7facb7 100644
--- a/site/docs/key-value-storage.md
+++ b/site/docs/key-value-storage.md
@@ -75,4 +75,4 @@
 
 Overall, this provides a much lower-level support that may be of use in specific applications which already have data
 stored in Accumulo tables. An end-to-end example can provide some basic insight to [what is currently
-possible](/docs/flight-example).
+possible]({{site.url}}/docs/flight-example).
diff --git a/site/docs/map-storage.md b/site/docs/map-storage.md
index d7bc443..300b6d3 100644
--- a/site/docs/map-storage.md
+++ b/site/docs/map-storage.md
@@ -160,4 +160,4 @@
 </table>
 
 In addition to dealing with data in this row with columns approach, you can also treat read/write data from Accumulo
-with Pig in terms of [keys and values](/docs/key-value-storage).
+with Pig in terms of [keys and values]({{site.url}}/docs/key-value-storage).
diff --git a/site/index.html b/site/index.html
index 4f3d13d..69329ee 100644
--- a/site/index.html
+++ b/site/index.html
@@ -1,27 +1,22 @@
----
-layout: default
-title: Accumulo Storage with Pig
----
-<p> 
-    <a href="http://accumulo.apache.org">Apache Accumulo</a> is a sorted, distributed, key-value store built using <a href="http://hadoop.apache.org">Apache
-        Hadoop</a> and <a href="http://zookeeper.apache.org">Apache ZooKeeper</a>. <a href="http://pig.apache.org">Apache Pig</a> is a platform for analyzing
-    large data sets using a high-level expression language, <em>Pig Latin</em>. This project intends to provide the mechanisms for storage and retrieval of data stored in Accumulo
-    using Pig's expression language
-</p>
+--- 
+layout: default 
+title: Accumulo Storage with Pig 
+--- 
+<p> <a href="http://accumulo.apache.org">Apache Accumulo</a> is a sorted, distributed, key-value store built using <a
+href="http://hadoop.apache.org">Apache Hadoop</a> and <a href="http://zookeeper.apache.org">Apache ZooKeeper</a>. <a
+href="http://pig.apache.org">Apache Pig</a> is a platform for analyzing large data sets using a high-level expression
+language, <em>Pig Latin</em>. This project intends to provide the mechanisms for storage and retrieval of data stored in
+Accumulo using Pig's expression language </p>
 
-<p>
-    This work was initially based on a contribution by Jason Trost to Apache Accumulo, but has been recently revitalized to ensure compatibility with all stable
-versions of Apache Accumulo as well as supporting as much of Pig Latin's functionality as efficiently as possible.
-</p>
+<p> This work was initially based on a contribution by Jason Trost to Apache Accumulo, but has been recently revitalized
+to ensure compatibility with all stable versions of Apache Accumulo as well as supporting as much of Pig Latin's
+functionality as efficiently as possible. Many decisions were influenced by the functionality that <em>HBaseStorage</em>
+that currently exists in Pig.</p>
+
+<p> The code can be viewed at <a href="http://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git">accumulo-pig.git</a>
+or can be cloned using <a href="http://git-scm.com">Git</a>
+
+<pre class="code" style="padding-bottom:15px; width: auto"> git clone https://git-wip-us.apache.org/repos/asf/accumulo-pig.git </pre> </p>
 
 
-<p>
-The code can be viewed at <a href="http://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git">accumulo-pig.git</a> or can be cloned using <a
-    href="http://git-scm.com">Git</a>
-
-<pre class="code" style="padding-bottom:15px; width: auto">
-git clone https://git-wip-us.apache.org/repos/asf/accumulo-pig.git
-</pre>
-</p>
-
-<p>If you're interested, please continue on to the <a href="docs/introduction">introduction</a>.</p.
+<p>If you're interested, please continue on to the <a href="{{ site.url }}/docs/introduction">introduction</a>.</p.