diff --git a/build.gradle b/build.gradle
index 1d47b92..5f3dc97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,15 +29,14 @@ allprojects {
 }
 
 dependencies {
-	
+
 	compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
 	
 	implementation 'com.github.TheDutchMC:HaroTorch:v1-SNAPSHOT'
 	implementation 'commons-io:commons-io:2.6'
-	implementation 'dev.array21:bukkit-reflection-util:1.0'
-    implementation 'dev.array21:pluginstatlib:1.0.5'
+	implementation 'dev.array21:bukkit-reflection-util:1.1.1'
 	implementation 'dev.array21:classvalidator:1.0.0'
-    implementation 'com.github.TheDutchMC:HttpLib:1.1'
+	implementation 'dev.array21:httplib:1.2.2'
 }
 
 processResources  {
diff --git a/gradle.properties b/gradle.properties
index 4fd442b..c1c55f4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-pluginVersion = 2.4.2
-pluginGroup = nl.thedutchmc.harotorch
+pluginVersion = 2.4.3
+pluginGroup = dev.array21.harotorch
 pluginName = HaroTorch
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf..e750102 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/src/main/java/dev/array21/harotorch/HaroTorch.java b/src/main/java/dev/array21/harotorch/HaroTorch.java
index a0a42d3..bafcaaa 100644
--- a/src/main/java/dev/array21/harotorch/HaroTorch.java
+++ b/src/main/java/dev/array21/harotorch/HaroTorch.java
@@ -8,8 +8,6 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import dev.array21.pluginstatlib.PluginStat;
-import dev.array21.pluginstatlib.PluginStat.PluginStatBuilder;
 import net.md_5.bungee.api.ChatColor;
 import dev.array21.harotorch.commands.TorchCommandExecutor;
 import dev.array21.harotorch.commands.TorchCommandTabCompleter;
@@ -46,18 +44,6 @@ public void run() {
 		this.configHandler.readConfig();
 		
 		ConfigManifest manifest = this.configHandler.getManifest();
-		
-		if(manifest.isStatEnabled()) {
-			PluginStat stat = PluginStatBuilder.createDefault()
-					.setLogErrFn(HaroTorch::logWarn)
-					.setSetUuidFn(this.configHandler::setStatUuid)
-					.setUuid(manifest.statUuid != null ? manifest.statUuid : "")
-					.build();
-			
-			stat.start();
-		}
-
-		
 		LangHandler langHandler = new LangHandler(this);
 		langHandler.load();
 		
diff --git a/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightAreaOfEffectExecutor.java b/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightAreaOfEffectExecutor.java
index 119fba3..a167b23 100644
--- a/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightAreaOfEffectExecutor.java
+++ b/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightAreaOfEffectExecutor.java
@@ -155,89 +155,85 @@ public List<Future<TorchParticleObject>> getParticlesSquare(List<Location> nearb
 		final int range = plugin.getConfigManifest().torchRange;
 
 		for(Location lTorch : nearbyTorches) {
-			Callable<TorchParticleObject> c = new Callable<HighlightAreaOfEffectExecutor.TorchParticleObject>() {
-				
-				@Override
-				public TorchParticleObject call() throws Exception {
-					List<Location> locs = new ArrayList<>();
+			Callable<TorchParticleObject> c = () -> {
+				List<Location> locs = new ArrayList<>();
 
-					Location xNeg = lTorch.clone();
-					xNeg.setX(lTorch.getX() - range);
-					locs.add(xNeg);
-					
-					Location xPos = lTorch.clone();
-					xPos.setX(xPos.getX() + range);
-					locs.add(xPos);
-					
-					Location zNeg = lTorch.clone();
-					zNeg.setZ(lTorch.getZ() - range);
-					locs.add(zNeg);
-					
-					Location zPos = lTorch.clone();
-					zPos.setZ(lTorch.getZ() + range);
-					locs.add(zPos);
-					
-					// xNeg + 
-					for(int i = 1; i <= range; i++) {
-						Location l = xNeg.clone();
-						l.setZ(xNeg.getZ() + i);
-						locs.add(l);
-					}
-					
-					// xNeg -
-					for(int i = -1; i >= -range; i--) {
-						Location l = xNeg.clone();
-						l.setZ(xNeg.getZ() + i);
-						locs.add(l);
-					}
-					
-					// xPos +
-					for(int i = 1; i <= range; i++) {
-						Location l = xPos.clone();
-						l.setZ(xPos.getZ() + i);
-						locs.add(l);
-					}
-					
-					// xPos -
-					for(int i = -1; i >= -range; i--) {
-						Location l = xPos.clone();
-						l.setZ(xPos.getZ() + i);
-						locs.add(l);
-					}
-					
-					// zNeg +
-					for(int i = 1; i <= range; i++) {
-						Location l = zNeg.clone();
-						l.setX(zNeg.getX() + i);
-						locs.add(l);
-					}
-					
-					// zNeg -
-					for(int i = -1; i >= -range; i--) {
-						Location l = zNeg.clone();
-						l.setX(zNeg.getX() + i);
-						locs.add(l);
-					}
-					
-					// zPos +
-					for(int i = 1; i <= range; i++) {
-						Location l = zPos.clone();
-						l.setX(zPos.getX() + i);
-						locs.add(l);
-					}
-					
-					// zPos -
-					for(int i = -1; i >= -range; i--) {
-						Location l = zPos.clone();
-						l.setX(zPos.getX() + i);
-						locs.add(l);
-					}
-					
-					final int r = (int) (Math.random() * 256D);
-					final int g = (int) (Math.random() * 256D);
-					final int b = (int) (Math.random() * 256D);
-					return new TorchParticleObject(r, g, b, locs, lTorch);
+				Location xNeg = lTorch.clone();
+				xNeg.setX(lTorch.getX() - range);
+				locs.add(xNeg);
+
+				Location xPos = lTorch.clone();
+				xPos.setX(xPos.getX() + range);
+				locs.add(xPos);
+
+				Location zNeg = lTorch.clone();
+				zNeg.setZ(lTorch.getZ() - range);
+				locs.add(zNeg);
+
+				Location zPos = lTorch.clone();
+				zPos.setZ(lTorch.getZ() + range);
+				locs.add(zPos);
+
+				// xNeg +
+				for(int i = 1; i <= range; i++) {
+					Location l = xNeg.clone();
+					l.setZ(xNeg.getZ() + i);
+					locs.add(l);
+				}
+
+				// xNeg -
+				for(int i = -1; i >= -range; i--) {
+					Location l = xNeg.clone();
+					l.setZ(xNeg.getZ() + i);
+					locs.add(l);
+				}
+
+				// xPos +
+				for(int i = 1; i <= range; i++) {
+					Location l = xPos.clone();
+					l.setZ(xPos.getZ() + i);
+					locs.add(l);
+				}
+
+				// xPos -
+				for(int i = -1; i >= -range; i--) {
+					Location l = xPos.clone();
+					l.setZ(xPos.getZ() + i);
+					locs.add(l);
+				}
+
+				// zNeg +
+				for(int i = 1; i <= range; i++) {
+					Location l = zNeg.clone();
+					l.setX(zNeg.getX() + i);
+					locs.add(l);
+				}
+
+				// zNeg -
+				for(int i = -1; i >= -range; i--) {
+					Location l = zNeg.clone();
+					l.setX(zNeg.getX() + i);
+					locs.add(l);
+				}
+
+				// zPos +
+				for(int i = 1; i <= range; i++) {
+					Location l = zPos.clone();
+					l.setX(zPos.getX() + i);
+					locs.add(l);
+				}
+
+				// zPos -
+				for(int i = -1; i >= -range; i--) {
+					Location l = zPos.clone();
+					l.setX(zPos.getX() + i);
+					locs.add(l);
 				}
+
+				final int r = (int) (Math.random() * 256D);
+				final int g = (int) (Math.random() * 256D);
+				final int b = (int) (Math.random() * 256D);
+				return new TorchParticleObject(r, g, b, locs, lTorch);
 			};
 		
 			Future<TorchParticleObject> fut = POOL.submit(c);
@@ -259,31 +255,28 @@ public List<Future<TorchParticleObject>> getParticlesCircular(List<Location> nea
 		for(Location l : nearbyTorches) {
 			final int y = l.getWorld().getHighestBlockYAt(l);
 			
-			Callable<TorchParticleObject> callable = new Callable<TorchParticleObject>() {
-				@Override
-				public TorchParticleObject call() throws Exception {
-					final List<Location> blocksOnTorchRadius = new ArrayList<>();
+			Callable<TorchParticleObject> callable = () -> {
+				final List<Location> blocksOnTorchRadius = new ArrayList<>();
 
-					final int radius = plugin.getConfigManifest().torchRange;
-					final int cx = l.getBlockX();
-					final int cz = l.getBlockZ();
-					final World w = l.getWorld();
-					
-					for(int i = 0; i < 360; i++) {
-						
-						final double rad = i * ((2 * Math.PI)/360);
-						
-						final int x = (int) (cx + (radius * Math.cos(rad)));
-						final int z = (int) (cz + (radius * Math.sin(rad)));						
-						blocksOnTorchRadius.add(new Location(w, x, y, z));
-					}
-					
-					final int r = (int) (Math.random() * 256D);
-					final int g = (int) (Math.random() * 256D);
-					final int b = (int) (Math.random() * 256D);
-					
-					return new TorchParticleObject(r, g, b, blocksOnTorchRadius, l);
+				final int radius = plugin.getConfigManifest().torchRange;
+				final int cx = l.getBlockX();
+				final int cz = l.getBlockZ();
+				final World w = l.getWorld();
+
+				for(int i = 0; i < 360; i++) {
+
+					final double rad = i * ((2 * Math.PI)/360);
+
+					final int x = (int) (cx + (radius * Math.cos(rad)));
+					final int z = (int) (cz + (radius * Math.sin(rad)));
+					blocksOnTorchRadius.add(new Location(w, x, y, z));
 				}
+
+				final int r = (int) (Math.random() * 256D);
+				final int g = (int) (Math.random() * 256D);
+				final int b = (int) (Math.random() * 256D);
+
+				return new TorchParticleObject(r, g, b, blocksOnTorchRadius, l);
 			};
 			
 			Future<TorchParticleObject> fut = POOL.submit(callable);
@@ -331,9 +324,15 @@ private void spawnParticles(List<Object> particlePackets, Player player) {
 				playerConnectionObject = ReflectionUtil.getObject(entityPlayerObject, "playerConnection");
 			}		
 			for(Object packet : particlePackets) {
-				ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket", 
-						new Class<?>[] { packetPlayOutWorldParticleInterfaceClass }, 
-						new Object[] { packet });
+				if(ReflectionUtil.getMajorVersion() >= 18) {
+					ReflectionUtil.invokeMethod(playerConnectionObject, "a",
+							new Class<?>[] { packetPlayOutWorldParticleInterfaceClass },
+							new Object[] { packet });
+				} else {
+					ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
+							new Class<?>[] { packetPlayOutWorldParticleInterfaceClass },
+							new Object[] { packet });
+				}
 			}
 		} catch(Exception e) {
 			e.printStackTrace();
diff --git a/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightExecutor.java b/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightExecutor.java
index 85a345b..b029778 100644
--- a/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightExecutor.java
+++ b/src/main/java/dev/array21/harotorch/commands/torchSubCmds/HighlightExecutor.java
@@ -26,7 +26,7 @@ public class HighlightExecutor implements SubCommand {
 	 * K = The UUID of the player
 	 * V = Miliseconds since Jan 1 1970 after which the Player may execute a command again
 	 */
-	private static HashMap<UUID, Long> lastCommandTimestamps = new HashMap<>();
+	private static final HashMap<UUID, Long> lastCommandTimestamps = new HashMap<>();
 	
 	private static Class<?> craftPlayerClass;
 	private static Class<?> craftWorldClass;
@@ -62,7 +62,7 @@ public class HighlightExecutor implements SubCommand {
 				packetPlayOutEntityDestroyClass = ReflectionUtil.getMinecraftClass("network.protocol.game.PacketPlayOutEntityDestroy");
 				dataWatcherClass = ReflectionUtil.getMinecraftClass("network.syncher.DataWatcher");
 
-				entityMagmaCubeField = ReflectionUtil.getObject(null, entityTypesClass, "X");
+				entityMagmaCubeField = ReflectionUtil.getObject(entityTypesClass, (Object) null, "X");
 			} else {
 				worldClass = ReflectionUtil.getNmsClass("World");
 				entityTypesClass = ReflectionUtil.getNmsClass("EntityTypes");
@@ -75,7 +75,7 @@ public class HighlightExecutor implements SubCommand {
 				packetPlayOutEntityDestroyClass = ReflectionUtil.getNmsClass("PacketPlayOutEntityDestroy");
 				dataWatcherClass = ReflectionUtil.getNmsClass("DataWatcher");
 				
-				entityMagmaCubeField = ReflectionUtil.getObject(null, entityTypesClass, "MAGMA_CUBE");
+				entityMagmaCubeField = ReflectionUtil.getObject(entityTypesClass, (Object) null, "MAGMA_CUBE");
 			}
 			
 			packetPlayOutEntityLivingInterfaceClass = packetPlayOutEntityLivingClass.getInterfaces()[0];
@@ -145,43 +145,74 @@ public List<Integer> spawnHighlight(Player player, List<Location> locations) {
 			for(Location loc : locations) {
 				Object nmsWorld = ReflectionUtil.invokeMethod(craftWorldClass, loc.getWorld(), "getHandle");
 				Object entityMagmaCube = ReflectionUtil.invokeConstructor(entityMagmaCubeClass, new Class<?>[] { entityTypesClass, worldClass }, new Object[] { entityMagmaCubeField, nmsWorld });
-				
-				ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setInvisible", new Class<?>[] { boolean.class }, new Object[] { false });
-				entityLivingClass.getField("collides").set(entityMagmaCube, false);
-				
-				//Glowing
-				ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setFlag", new Class<?>[] { int.class, boolean.class }, new Object[] { 6, true });
-				
-				//Invisibility
-				ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setFlag", new Class<?>[] { int.class, boolean.class }, new Object[] { 5, true });
-				
-				//Size
-				ReflectionUtil.invokeMethod(entitySlimeClass, entityMagmaCube, "setSize", new Class<?>[] { int.class, boolean.class }, new Object[] { 2, true });
-				
-				ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setLocation", 
-						new Class<?>[] { double.class, double.class, double.class, float.class, float.class}, 
-						new Object[] { loc.getBlockX() + 0.5D, loc.getBlockY(), loc.getBlockZ() + 0.5D, 0f, 0f});
+
+				if(ReflectionUtil.getMajorVersion() >= 18) {
+					// setInvisible
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "j", new Class<?>[] { boolean.class }, new Object[] { false });
+					//entityLivingClass.getField("collides").set(entityMagmaCube, false);
+					// setSharedFlag; Glowing
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "b", new Class<?>[] { int.class, boolean.class }, new Object[] { 6, true });
+					// setSharedFlag; Invisibility
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "b", new Class<?>[] { int.class, boolean.class }, new Object[] { 5, true });
+					// setSize
+					ReflectionUtil.invokeMethod(entitySlimeClass, entityMagmaCube, "a", new Class<?>[] { int.class, boolean.class }, new Object[] { 2, true });
+					// setPosRaw
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "o",
+							new Class<?>[] { double.class, double.class, double.class },
+							new Object[] { loc.getBlockX() + 0.5D, loc.getBlockY(), loc.getBlockZ() + 0.5D });
+					// setYRot
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "o",
+							new Class<?>[] { float.class },
+							new Object[] { 0f });
+					// setXRot
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "p",
+							new Class<?>[] { float.class },
+							new Object[] { 0f });
+				} else {
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setInvisible", new Class<?>[] { boolean.class }, new Object[] { false });
+					entityLivingClass.getField("collides").set(entityMagmaCube, false);
+					//Glowing
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setFlag", new Class<?>[] { int.class, boolean.class }, new Object[] { 6, true });
+					//Invisibility
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setFlag", new Class<?>[] { int.class, boolean.class }, new Object[] { 5, true });
+					//Size
+					ReflectionUtil.invokeMethod(entitySlimeClass, entityMagmaCube, "setSize", new Class<?>[] { int.class, boolean.class }, new Object[] { 2, true });
+					ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "setLocation",
+							new Class<?>[] { double.class, double.class, double.class, float.class, float.class},
+							new Object[] { loc.getBlockX() + 0.5D, loc.getBlockY(), loc.getBlockZ() + 0.5D, 0f, 0f});
+				}
 				
 				Object spawnEntityLivingPacket = ReflectionUtil.invokeConstructor(packetPlayOutEntityLivingClass, new Class<?>[] { entityLivingClass }, new Object[] { entityMagmaCube });
 				Object entityMetadataPacket = ReflectionUtil.invokeConstructor(packetPlayOutEntityMetadataClass, 
 						new Class<?>[] { int.class, dataWatcherClass,  boolean.class}, 
 						new Object[] { 
-								ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "getId"),
-								ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "getDataWatcher"),
+								ReflectionUtil.getMajorVersion() >= 18 ?
+										ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "ae")
+										: ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "getId"),
+								ReflectionUtil.getMajorVersion() >= 18 ?
+										ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "ai")
+										: ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "getDataWatcher"),
 								false
 						});
-				
-				ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket", 
-						new Class<?>[] { packetPlayOutEntityLivingInterfaceClass }, 
-						new Object[] { spawnEntityLivingPacket });
-				
-				ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
-						new Class<?>[] { packetPlayOutEntityMetadataInterfaceClass },
-						new Object[] { entityMetadataPacket });
-				
-				result.add((Integer) ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "getId"));
+
+				if(ReflectionUtil.getMajorVersion() >= 18) {
+					ReflectionUtil.invokeMethod(playerConnectionObject, "a",
+							new Class<?>[] { packetPlayOutEntityLivingInterfaceClass },
+							new Object[] { spawnEntityLivingPacket });
+					ReflectionUtil.invokeMethod(playerConnectionObject, "a",
+							new Class<?>[] { packetPlayOutEntityMetadataInterfaceClass },
+							new Object[] { entityMetadataPacket });
+					result.add((Integer) ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "ae"));
+				} else {
+					ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
+							new Class<?>[] { packetPlayOutEntityLivingInterfaceClass },
+							new Object[] { spawnEntityLivingPacket });
+					ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
+							new Class<?>[] { packetPlayOutEntityMetadataInterfaceClass },
+							new Object[] { entityMetadataPacket });
+					result.add((Integer) ReflectionUtil.invokeMethod(entityClass, entityMagmaCube, "getId"));
+				}
 			}
-			
 		} catch(Exception e) {
 			e.printStackTrace();
 		}
@@ -214,24 +245,43 @@ public void killHighlighted(List<Integer> ids, Player player) {
 				if(patch == 0 && minor == 17) {
 					for(int id : ids) {
 						Object destroyEntityPacket = ReflectionUtil.invokeConstructor(packetPlayOutEntityDestroyClass, new Class<?>[] { int.class }, new Object[] { id });
-						ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
-								new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass }, 
-								new Object[] { destroyEntityPacket });
+
+						if(ReflectionUtil.getMajorVersion() >= 18) {
+							ReflectionUtil.invokeMethod(playerConnectionObject, "a",
+									new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass },
+									new Object[] { destroyEntityPacket });
+						} else {
+							ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
+									new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass },
+									new Object[] { destroyEntityPacket });
+						}
 					}
 				} else {
 					Object destroyEntityPacket = ReflectionUtil.invokeConstructor(packetPlayOutEntityDestroyClass, new Class<?>[] { int[].class }, new Object[] { toIntArray(ids) });
-					ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
-							new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass }, 
-							new Object[] { destroyEntityPacket });
+
+					if(ReflectionUtil.getMajorVersion() >= 18) {
+						ReflectionUtil.invokeMethod(playerConnectionObject, "a",
+								new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass },
+								new Object[] { destroyEntityPacket });
+					} else {
+						ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
+								new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass },
+								new Object[] { destroyEntityPacket });
+					}
 				}
 			} else {
 				Object destroyEntityPacket = ReflectionUtil.invokeConstructor(packetPlayOutEntityDestroyClass, new Class<?>[] { int[].class }, new Object[] { toIntArray(ids) });
-				ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
-						new Class<?>[] { packetPlayOutEntityDestroyInterfaceClass }, 
-						new Object[] { destroyEntityPacket });
-			}
 
-			
+				if (ReflectionUtil.getMajorVersion() >= 18) {
+					ReflectionUtil.invokeMethod(playerConnectionObject, "a",
+							new Class<?>[]{packetPlayOutEntityDestroyInterfaceClass},
+							new Object[]{destroyEntityPacket});
+				} else {
+					ReflectionUtil.invokeMethod(playerConnectionObject, "sendPacket",
+							new Class<?>[]{packetPlayOutEntityDestroyInterfaceClass},
+							new Object[]{destroyEntityPacket});
+				}
+			}
 		} catch(Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/dev/array21/harotorch/torch/StorageHandler.java b/src/main/java/dev/array21/harotorch/torch/StorageHandler.java
index d8c30bc..4a4c6ab 100644
--- a/src/main/java/dev/array21/harotorch/torch/StorageHandler.java
+++ b/src/main/java/dev/array21/harotorch/torch/StorageHandler.java
@@ -21,7 +21,6 @@
 
 public class StorageHandler {
 
-	
 	private String basePath;
 	
 	public StorageHandler(HaroTorch plugin) {
diff --git a/src/main/java/dev/array21/harotorch/torch/Torch.java b/src/main/java/dev/array21/harotorch/torch/Torch.java
index d454ff1..9502493 100644
--- a/src/main/java/dev/array21/harotorch/torch/Torch.java
+++ b/src/main/java/dev/array21/harotorch/torch/Torch.java
@@ -11,8 +11,8 @@ public class Torch implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	private UUID torchOwner;
-	private int x, y, z;
-	private String worldName;
+	private final int x, y, z;
+	private final String worldName;
 	
 	public Torch(UUID torchOwner, Location torchLocation) {
 		this.torchOwner = torchOwner;
diff --git a/src/main/java/dev/array21/harotorch/update/UpdateChecker.java b/src/main/java/dev/array21/harotorch/update/UpdateChecker.java
index 93e4bc0..3f69aba 100644
--- a/src/main/java/dev/array21/harotorch/update/UpdateChecker.java
+++ b/src/main/java/dev/array21/harotorch/update/UpdateChecker.java
@@ -7,13 +7,13 @@
 import com.google.gson.Gson;
 
 import dev.array21.harotorch.HaroTorch;
-import nl.thedutchmc.httplib.Http;
-import nl.thedutchmc.httplib.Http.RequestMethod;
-import nl.thedutchmc.httplib.Http.ResponseObject;
+import dev.array21.httplib.Http;
+import dev.array21.httplib.Http.RequestMethod;
+import dev.array21.httplib.Http.ResponseObject;
 
 public class UpdateChecker {
 	
-	private HaroTorch plugin;
+	private final HaroTorch plugin;
 	
 	public UpdateChecker(HaroTorch plugin) {
 		this.plugin = plugin;
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 2805eb2..70addea 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -69,8 +69,13 @@ mobsExcludeFromBlockList:
 # Set to -1 to disable
 torchPlaceLimit: -1
 
-
 # Command cooldown in seconds. Default: 30. -1 to disable.
 commandCooldown: 30
 
-shapeCircle: true
\ No newline at end of file
+shapeCircle: true
+
+# The Y height above the Torch where it will have an effect. Set to -1 to disable
+torchAboveYRange: -1
+
+# The Y height below the Torch where it will have an effect. Set to -1 to disable
+torchBelowYRange: -1
\ No newline at end of file