diff --git a/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java b/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
index 9ee1ad7d..c5079bcc 100644
--- a/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
+++ b/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
@@ -14,7 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 /**
  * Contains some useful static methods for interacting with the ally designation system. Also handles the friendly fire
- * setting. This was split off from {@link JavaUtils} as of wizardry 4.2 in an effort to make the code easier to
+ * setting. This was split off from {@code WizardryUtilities} as of wizardry 4.2 in an effort to make the code easier to
  * navigate.
  */
 @Mod.EventBusSubscriber
diff --git a/src/main/java/electroblob/wizardry/util/NBTExtras.java b/src/main/java/electroblob/wizardry/util/NBTExtras.java
index c2d439b5..0d2fc636 100644
--- a/src/main/java/electroblob/wizardry/util/NBTExtras.java
+++ b/src/main/java/electroblob/wizardry/util/NBTExtras.java
@@ -10,7 +10,7 @@ import java.util.function.Function;
 
 /**
  * Contains a number of useful static methods for interacting with NBT data, particularly involving collections.
- * This was split off from {@link JavaUtils} as of wizardry 4.2 in an effort to make the code easier to navigate.
+ * This was split off from {@code WizardryUtilities} as of wizardry 4.2 in an effort to make the code easier to navigate.
  *
  * @author Electroblob
  * @since Wizardry 4.2
diff --git a/src/main/java/electroblob/wizardry/util/RayTracer.java b/src/main/java/electroblob/wizardry/util/RayTracer.java
index 61b47853..09b675a1 100644
--- a/src/main/java/electroblob/wizardry/util/RayTracer.java
+++ b/src/main/java/electroblob/wizardry/util/RayTracer.java
@@ -14,7 +14,7 @@ import java.util.function.Predicate;
 
 /**
  * Contains a number of static methods that perform raytracing and related functions. This was split off from
- * {@link JavaUtils} as of wizardry 4.2 in an effort to make the code easier to navigate.
+ * {@code WizardryUtilities} as of wizardry 4.2 in an effort to make the code easier to navigate.
  *
  * @author Electroblob
  * @since Wizardry 4.2
diff --git a/src/main/java/electroblob/wizardry/util/WandHelper.java b/src/main/java/electroblob/wizardry/util/WandHelper.java
index 9dda1184..7aad48cd 100644
--- a/src/main/java/electroblob/wizardry/util/WandHelper.java
+++ b/src/main/java/electroblob/wizardry/util/WandHelper.java
@@ -52,7 +52,7 @@ public final class WandHelper {
 
 	private static final HashMap<Item, String> upgradeMap = new HashMap<>();
 
-	static {
+	static { // TODO: Move these to a proper initialisation method, at the moment we're relying on class load order!
 		upgradeMap.put(WizardryItems.condenser_upgrade, "condenser");
 		upgradeMap.put(WizardryItems.storage_upgrade, "storage");
 		upgradeMap.put(WizardryItems.siphon_upgrade, "siphon");
diff --git a/src/main/java/electroblob/wizardry/worldgen/WorldGenCrystalOre.java b/src/main/java/electroblob/wizardry/worldgen/WorldGenCrystalOre.java
index 151b3776..628de04b 100644
--- a/src/main/java/electroblob/wizardry/worldgen/WorldGenCrystalOre.java
+++ b/src/main/java/electroblob/wizardry/worldgen/WorldGenCrystalOre.java
@@ -15,6 +15,8 @@ import java.util.Random;
 
 public class WorldGenCrystalOre implements IWorldGenerator {
 
+	// TODO: Probably this and the flowers are causing cascading lag!
+
 	@Override
 	public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider){