diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
index c90f3f7..ae9f942 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -15,7 +15,7 @@
 issues the project is currently aware of (note that this list, by
 definition, is likely to be incomplete): 
 
- * The LICENSE and NOTICE files may not be complete and will be fixed with the next release.
+ * No issues are known at this time. 
 
 If you are planning to incorporate this work into your
 product or project, please be aware that you will need to conduct a
diff --git a/README.md b/README.md
index 9705ad1..d039f36 100644
--- a/README.md
+++ b/README.md
@@ -26,15 +26,15 @@
 =================
 
 # DataSketches UDF/UDAF Adaptors for Apache Pig 
-Please refer to our [website](https://datasketches.github.io) for more comprehensive information about the various sketching algorithms and how to use them.
+Please refer to our [website](https://datasketches.apache.org) for more comprehensive information about the various sketching algorithms and how to use them.
 
 ## Documentation
 
-### [DataSketches Library Website](https://datasketches.github.io/)
+### [DataSketches Library Website](https://datasketches.apache.org/)
 
-### [Java Core Overview](https://datasketches.github.io/docs/TheChallenge.html)
+### [Java Core Overview](https://datasketches.apache.org/docs/TheChallenge.html)
 
-### [Java Core Javadocs](https://datasketches.github.io/api/core/snapshot/apidocs/index.html)
+### [Java Core Javadocs](https://datasketches.apache.org/api/core/snapshot/apidocs/index.html)
 
 ### Hadoop Pig UDFs 
 See relevant sections under the different sketch types in Java Core Overview
@@ -47,7 +47,7 @@
 This is required by the Oracle Java Specification in order to ensure location-independent 
     access to resources: [See Oracle Location-Independent Access to Resources](https://docs.oracle.com/javase/8/docs/technotes/guides/lang/resources.html)
 
-### [Zip File from Apache Archive](http://archive.apache.org/dist/incubator/datasketches/pig/)
+### [Zip File from www.apache.org/dist](http://www.apache.org/dist/incubator/datasketches/pig/)
 
 ### [Jar Files from Maven Central](https://repository.apache.org/content/repositories/releases/org/apache/datasketches/datasketches-pig/)
 
@@ -55,7 +55,7 @@
 
 ## Build Instructions
 
-### JDK8 is Required Compiler
+### JDK8 is required to compile
 This DataSketches component is pure Java and you must compile using JDK 8.
 
 ### Recommended Build Tool
diff --git a/src/main/java/org/apache/datasketches/pig/kll/package-info.java b/src/main/java/org/apache/datasketches/pig/kll/package-info.java
index e5d77a4..c85e90c 100644
--- a/src/main/java/org/apache/datasketches/pig/kll/package-info.java
+++ b/src/main/java/org/apache/datasketches/pig/kll/package-info.java
@@ -19,8 +19,8 @@
 
 /**
  * Pig UDFs for KLL quantiles sketches.
- * See https://datasketches.github.io/docs/Quantiles/KLLSketch.html
- * 
+ * See https://datasketches.apache.org/docs/Quantiles/KLLSketch.html
+ *
  * @author Alexander Saydakov
  */
 package org.apache.datasketches.pig.kll;
diff --git a/src/main/javadoc/resources/dictionary.html b/src/main/javadoc/resources/dictionary.html
index 18004cc..ab26f61 100644
--- a/src/main/javadoc/resources/dictionary.html
+++ b/src/main/javadoc/resources/dictionary.html
@@ -31,7 +31,7 @@
 
 <h3><a name="alphaTCF">Alpha TCF</a></h3>
 The Alpha Theta Choosing Function (TCF) and the theory behind it is fully described in the 
-<a href="https://github.com/DataSketches/DataSketches.github.io/blob/master/docs/pdf/ThetaSketchFramework.pdf">Theta Sketch Framework</a> paper. 
+<a href="https://github.com/DataSketches/DataSketches.apache.org/blob/master/docs/pdf/ThetaSketchFramework.pdf">Theta Sketch Framework</a> paper. 
 The alpha algorithm is optimized for speed and accuracy in a real-time sketch
 building / estimating environment.
 <p>One of the properties of the Alpha Algorithm used for cache management within a sketch is that
@@ -238,7 +238,7 @@
 
 <h3><a name="tcf">Theta Choosing Function (TCF)</a></h3>
 For Theta Sketches, the Theta Choosing Function (TCF) and the theory behind it is fully described in the
-<a href="https://github.com/DataSketches/DataSketches.github.io/blob/master/docs/pdf/ThetaSketchFramework.pdf">Theta Sketch Framework</a> paper.
+<a href="https://github.com/DataSketches/DataSketches.apache.org/blob/master/docs/pdf/ThetaSketchFramework.pdf">Theta Sketch Framework</a> paper.
 
 <h3><a name="theta">Theta, &theta;</a></h3>
 For Theta Sketches, refers to the mathematical random variable &theta; that represents the current probability
@@ -257,7 +257,7 @@
 This framework also enables the sketches to share estimation, upper and lower bounds algorithms and 
 a common serialization data structure.
 The Theta Sketch Framework, Theta Choosing Functions and the theory behind them is fully described 
-in the <a href="https://github.com/DataSketches/DataSketches.github.io/blob/master/docs/pdf/ThetaSketchFramework.pdf">Theta Sketch Framework</a> paper.
+in the <a href="https://github.com/DataSketches/DataSketches.apache.org/blob/master/docs/pdf/ThetaSketchFramework.pdf">Theta Sketch Framework</a> paper.
 
 <h3><a name="updateReturnState">Update Return State</a></h3>
 For Theta Sketches, this provides useful detail for sketch characterization and debugging.  It is not required that any of