diff --git a/dist/pom.xml b/dist/pom.xml
index 7cb4a55e5..50b36e422 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -1,90 +1,91 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>net.citizensnpcs</groupId>
-        <artifactId>citizens-parent</artifactId>
-        <version>2.0.25-SNAPSHOT</version>
-    </parent>
-    <artifactId>citizens</artifactId>
-    <packaging>pom</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>Citizens-${CITIZENS_VERSION}-b${BUILD_NUMBER}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                </configuration>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <id>package-all</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/assembly/all-jar.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-main</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_8_R3</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_10_R1</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_11_R1</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_12_R1</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_13_R2</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_14_R1</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
+	</parent>
+	<artifactId>citizens</artifactId>
+	<packaging>pom</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<finalName>Citizens-${CITIZENS_VERSION}-b${BUILD_NUMBER}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>package-all</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/main/assembly/all-jar.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-main</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-v1_8_R3</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-v1_10_R1</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-v1_11_R1</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-v1_12_R1</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-v1_13_R2</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>citizens-v1_14_R1</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/main/pom.xml b/main/pom.xml
index 4c4939a1f..4669bd978 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -16,7 +16,7 @@
 		<craftbukkit.version>1.14-R0.1-SNAPSHOT</craftbukkit.version>
 		<citizensapi.version>${project.version}</citizensapi.version>
 		<powermock.version>1.4.12</powermock.version>
-		<bstats.version>1.4</bstats.version>
+		<bstats.version>1.5</bstats.version>
 	</properties>
 
 	<repositories>
@@ -164,33 +164,24 @@
 					</execution>
 				</executions>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.0.1</version>
-				<executions>
-					<execution>
-						<id>javadoc-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<includeDependencySources>true</includeDependencySources>
+				<configuration>
+					<source>8</source>
+					<author>false</author>
+					<doclint>none</doclint>
+					<links>
+						<link>https://hub.spigotmc.org/javadocs/spigot</link>
+					</links>
+					<includeDependencySources>true</includeDependencySources>
 
-							<dependencySourceIncludes>
-								<dependencySourceInclude>net.citizensnpcs.api:*</dependencySourceInclude>
-							</dependencySourceIncludes>
-
-							<source>8</source>
-							<author>false</author>
-							<doclint>none</doclint>
-							<links>
-								<link>https://hub.spigotmc.org/javadocs/spigot</link>
-							</links>
-						</configuration>
-					</execution>
-				</executions>
+					<dependencySourceIncludes>
+						<dependencySourceInclude>net.citizensnpcs:citizensapi</dependencySourceInclude>
+					</dependencySourceIncludes>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pom.xml b/pom.xml
index 30247158f..ea5f5b8ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <packaging>pom</packaging>
-    <groupId>net.citizensnpcs</groupId>
-    <artifactId>citizens-parent</artifactId>
-    <version>2.0.25-SNAPSHOT</version>
-    <properties>
-        <BUILD_NUMBER>Unknown</BUILD_NUMBER>
-        <CITIZENS_VERSION>2.0.25</CITIZENS_VERSION>
-    </properties>
-    <build>
-        <defaultGoal>clean package install</defaultGoal>
-    </build>
-    <modules>
-        <module>main</module>  
-        <module>v1_8_R3</module>
-        <module>v1_10_R1</module>
-        <module>v1_11_R1</module>
-        <module>v1_12_R1</module>
-        <module>v1_13_R2</module>
-        <module>v1_14_R1</module>
-        <module>dist</module>
-    </modules>
+	<packaging>pom</packaging>
+	<groupId>net.citizensnpcs</groupId>
+	<artifactId>citizens-parent</artifactId>
+	<version>2.0.25-SNAPSHOT</version>
+	<properties>
+		<BUILD_NUMBER>Unknown</BUILD_NUMBER>
+		<CITIZENS_VERSION>2.0.25</CITIZENS_VERSION>
+	</properties>
+	<build>
+		<defaultGoal>clean package install</defaultGoal>
+	</build>
+	<modules>
+		<module>main</module>
+		<module>v1_8_R3</module>
+		<module>v1_10_R1</module>
+		<module>v1_11_R1</module>
+		<module>v1_12_R1</module>
+		<module>v1_13_R2</module>
+		<module>v1_14_R1</module>
+		<module>dist</module>
+	</modules>
 </project>
\ No newline at end of file
diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml
index 3f5ea81a8..e62e35603 100644
--- a/v1_10_R1/pom.xml
+++ b/v1_10_R1/pom.xml
@@ -1,11 +1,12 @@
 <!-- Citizens build file -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>net.citizensnpcs</groupId>
-	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.25-SNAPSHOT</version>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
 	</parent>
 	<artifactId>citizens-v1_10_R1</artifactId>
 
@@ -30,12 +31,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>${craftbukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>${craftbukkit.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -71,7 +72,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> 
 		</plugins>
 	</build>
 </project>
diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml
index 2d0a38151..81d0a5412 100644
--- a/v1_11_R1/pom.xml
+++ b/v1_11_R1/pom.xml
@@ -1,11 +1,12 @@
 <!-- Citizens build file -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>net.citizensnpcs</groupId>
-	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.25-SNAPSHOT</version>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
 	</parent>
 	<artifactId>citizens-v1_11_R1</artifactId>
 
@@ -30,12 +31,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>${craftbukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>${craftbukkit.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -71,7 +72,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> 
 		</plugins>
 	</build>
 </project>
diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
index 8065f14a4..355626a71 100644
--- a/v1_12_R1/pom.xml
+++ b/v1_12_R1/pom.xml
@@ -1,11 +1,12 @@
 <!-- Citizens build file -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>net.citizensnpcs</groupId>
-	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.25-SNAPSHOT</version>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
 	</parent>
 	<artifactId>citizens-v1_12_R1</artifactId>
 
@@ -30,12 +31,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>${craftbukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>${craftbukkit.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -71,7 +72,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> 
 		</plugins>
 	</build>
 </project>
diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml
index b237da467..991636b29 100644
--- a/v1_13_R2/pom.xml
+++ b/v1_13_R2/pom.xml
@@ -1,11 +1,12 @@
 <!-- Citizens build file -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>net.citizensnpcs</groupId>
-	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.25-SNAPSHOT</version>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
 	</parent>
 	<artifactId>citizens-v1_13_R2</artifactId>
 
@@ -30,12 +31,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>${craftbukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>${craftbukkit.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml
index a3ca81a4c..adff1520a 100644
--- a/v1_14_R1/pom.xml
+++ b/v1_14_R1/pom.xml
@@ -1,11 +1,12 @@
 <!-- Citizens build file -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>net.citizensnpcs</groupId>
-	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.25-SNAPSHOT</version>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
 	</parent>
 	<artifactId>citizens-v1_14_R1</artifactId>
 
@@ -30,12 +31,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>${craftbukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>${craftbukkit.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -79,7 +80,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> 
 		</plugins>
 	</build>
 </project>
diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml
index deaf63428..8856d7365 100644
--- a/v1_8_R3/pom.xml
+++ b/v1_8_R3/pom.xml
@@ -1,11 +1,12 @@
 <!-- Citizens build file -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>net.citizensnpcs</groupId>
-	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.25-SNAPSHOT</version>
+		<groupId>net.citizensnpcs</groupId>
+		<artifactId>citizens-parent</artifactId>
+		<version>2.0.25-SNAPSHOT</version>
 	</parent>
 	<artifactId>citizens-v1_8_R3</artifactId>
 
@@ -30,12 +31,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>${craftbukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>${craftbukkit.version}</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -71,7 +72,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> 
 		</plugins>
 	</build>
 </project>