diff --git a/build.gradle b/build.gradle
index 34dfabe7fa..767db79ab1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,9 @@ subprojects {
     java {
         withJavadocJar()
         withSourcesJar()
+
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
     }
     /**
     signing {
@@ -40,7 +43,13 @@ subprojects {
     }
 
  **/
-
+    if (JavaVersion.current().isJava8Compatible()) {
+        allprojects {
+            tasks.withType(Javadoc) {
+                options.addStringOption('Xdoclint:none', '-quiet')
+            }
+        }
+    }
     javadoc {
         if(JavaVersion.current().isJava9Compatible()) {
             options.addBooleanOption('html5', true)
@@ -52,6 +61,14 @@ subprojects {
     signing {
         sign configurations.archives
     }
+    dependencies {
+        compileOnly "org.projectlombok:lombok:${lombokVersion}"
+        annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
+        // Test Dependencies
+        testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+        testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    }
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -116,7 +133,7 @@ subprojects {
 
     }
 }
-
+/**
 allprojects {
     tasks.withType(JavaCompile) {
         options.fork = true
@@ -124,3 +141,5 @@ allprojects {
     }
 
 }
+
+ **/
diff --git a/cyclops-futurestream/src/main/java/cyclops/futurestream/LazyReact.java b/cyclops-futurestream/src/main/java/cyclops/futurestream/LazyReact.java
index 8e0d8c9188..a17851cc96 100644
--- a/cyclops-futurestream/src/main/java/cyclops/futurestream/LazyReact.java
+++ b/cyclops-futurestream/src/main/java/cyclops/futurestream/LazyReact.java
@@ -22,6 +22,8 @@
 import cyclops.data.Seq;
 import cyclops.reactive.ReactiveSeq;
 import cyclops.reactive.Spouts;
+import lombok.Builder;
+import lombok.experimental.Wither;
 import org.reactivestreams.Publisher;
 
 import com.oath.cyclops.internal.react.FutureStreamImpl;
@@ -35,8 +37,7 @@
 
 import lombok.Getter;
 import lombok.ToString;
-import lombok.experimental.Builder;
-import lombok.experimental.Wither;
+
 
 /**
  *
diff --git a/cyclops/build.gradle b/cyclops/build.gradle
index 3adc208919..d3a6610bd0 100644
--- a/cyclops/build.gradle
+++ b/cyclops/build.gradle
@@ -1,14 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.bmuschko:gradle-nexus-plugin:2.2'
-    }
-}
-/**
- plugins {id 'me.champeau.gradle.jmh' version '0.2.0'}**/
 
 
 def custom = { "$rootDir/gradle/${it}.gradle" } //find custom plugins locally
@@ -45,7 +34,7 @@ dependencies {
     api 'org.agrona:Agrona:0.9.1'
     api 'org.reactivestreams:reactive-streams:1.0.0'
     api 'io.kindedj:kindedj:'+kindedJVersion
-    compileOnly 'org.projectlombok:lombok:1.16.20'
+
     testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.2.2.RELEASE'
     testImplementation 'com.github.stefanbirkner:system-rules:1.10.0'
     testImplementation 'io.projectreactor:reactor-core:3.2.2.RELEASE'
@@ -59,6 +48,7 @@ dependencies {
     testImplementation(group: 'org.hibernate', name: 'hibernate-core', version: '5.1.0.Final')
     testImplementation (group: 'org.hibernate', name: 'hibernate-entitymanager', version: '5.1.0.Final')
     testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+
     jmh 'com.github.akarnokd:ixjava:1.0.0-RC5'
     jmh 'io.vavr:vavr:0.9.2'
     jmh 'com.google.guava:guava:19.0'
@@ -95,6 +85,10 @@ test {
     testLogging {
         events "started", "passed", "skipped", "failed"//, "standardOut", "standardError"
     }
+    minHeapSize = "512m" // initial heap size
+    maxHeapSize = "1024m" // maximum heap size
+    jvmArgs '-XX:MaxPermSize=256m' // mem argument for the test JVM
+
 }
 
 test {
diff --git a/cyclops/src/jmh/java/cyclops/VectorOps.java b/cyclops/src/jmh/java/cyclops/VectorOps.java
index 7293f28d9c..5add27705d 100644
--- a/cyclops/src/jmh/java/cyclops/VectorOps.java
+++ b/cyclops/src/jmh/java/cyclops/VectorOps.java
@@ -1,11 +1,8 @@
 package cyclops;
 
 
-import com.google.common.collect.ImmutableList;
 import cyclops.data.Vector;
-import cyclops.data.tuple.Tuple;
-import cyclops.reactive.collections.immutable.VectorX;
-import io.vavr.collection.Stream;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -17,7 +14,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 
-import java.util.List;
+
 import java.util.concurrent.TimeUnit;
 
 
@@ -26,13 +23,13 @@ public class VectorOps {
 
 
     Vector<Integer> vector;
-    VectorX<Integer> vectorX;
+  //  VectorX<Integer> vectorX;
     io.vavr.collection.Vector<Integer> js;
 
     @Setup
     public void before() {
         vector = Vector.range(0, 100_000);
-        vectorX = VectorX.range(0, 100_000);
+     //   vectorX = VectorX.range(0, 100_000);
         js = io.vavr.collection.Vector.range(0, 100_000);
 
     }
@@ -83,7 +80,7 @@ public void vavrOps() {
 
     }
 
-
+/**
     @Benchmark
     @BenchmarkMode(Mode.SampleTime)
     @OutputTimeUnit(TimeUnit.MILLISECONDS)
@@ -110,6 +107,7 @@ public void vectorXOps() {
 
 
     }
+    **/
 
 }
 
diff --git a/cyclops/src/jmh/java/cyclops/data/vector/VectorMap.java b/cyclops/src/jmh/java/cyclops/data/vector/VectorMap.java
index 38a730e9bc..1ae323dd28 100644
--- a/cyclops/src/jmh/java/cyclops/data/vector/VectorMap.java
+++ b/cyclops/src/jmh/java/cyclops/data/vector/VectorMap.java
@@ -1,7 +1,7 @@
 package cyclops.data.vector;
 
 import cyclops.data.Vector;
-import cyclops.reactive.collections.immutable.VectorX;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
diff --git a/cyclops/src/main/java/cyclops/control/Option.java b/cyclops/src/main/java/cyclops/control/Option.java
index f2ee3cbbdb..f09e4beb3b 100644
--- a/cyclops/src/main/java/cyclops/control/Option.java
+++ b/cyclops/src/main/java/cyclops/control/Option.java
@@ -36,7 +36,7 @@
  @see Maybe is a lazy / reactive sub-class of Option
 
  **/
-public interface Option<T> extends To<Option<T>>,
+public interface Option<T>  extends To<Option<T>>,
                                     OrElseValue<T,Option<T>>,
                                     MonadicValue<T>,
                                     Zippable<T>,
@@ -102,7 +102,7 @@ static <T> Option<T> none() {
     }
 
     static <T> Option<T> some(T value){
-        return new Option.Some<>(value);
+        return new Option.Some<T>(value);
     }
 
     static <T> Option<T> fromFuture(Future<T> future){
diff --git a/gradle.properties b/gradle.properties
index 9c99e27c51..fcff491526 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ reactorVersion=3.3.1.RELEASE
 rxJava2Version=2.2.16
 kindedJVersion=1.1.0
 hamcrestVersion=1.3
-lombokVersion=1.18.4
+lombokVersion=1.16.20
 jacksonVersion=2.10.1