diff --git a/src/Ad5001/BetterGen/Main.php b/src/Ad5001/BetterGen/Main.php
index 55d69cb..ed72ce9 100644
--- a/src/Ad5001/BetterGen/Main.php
+++ b/src/Ad5001/BetterGen/Main.php
@@ -14,29 +14,26 @@
 
 namespace Ad5001\BetterGen;
 
+use Ad5001\BetterGen\biome\BetterForest;
+use Ad5001\BetterGen\generator\BetterNormal;
+use Ad5001\BetterGen\loot\LootTable;
+use pocketmine\block\Block;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
+use pocketmine\event\block\BlockBreakEvent;
+use pocketmine\event\level\ChunkPopulateEvent;
 use pocketmine\event\Listener;
-use pocketmine\plugin\PluginBase;
+use pocketmine\event\player\PlayerInteractEvent;
 use pocketmine\level\generator\biome\Biome;
 use pocketmine\level\generator\Generator;
-use pocketmine\level\generator\normal\Normal;
-use pocketmine\event\level\ChunkPopulateEvent;
-use Ad5001\BetterGen\generator\BetterNormal;
-use Ad5001\BetterGen\biome\BetterForest;
-use Ad5001\BetterGen\loot\LootTable;
-use pocketmine\utils\Config;
-use pocketmine\block\Block;
-use pocketmine\tile\Chest;
-use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\nbt\tag\IntTag;
+use pocketmine\plugin\PluginBase;
+use pocketmine\tile\Chest;
 use pocketmine\tile\Tile;
-use pocketmine\item\Item;
-use pocketmine\event\player\PlayerInteractEvent;
-use pocketmine\event\block\BlockBreakEvent;
+use pocketmine\utils\Config;
 
 class Main extends PluginBase implements Listener {
 	const PREFIX = "§l§o§b[§r§l§2Better§aGen§o§b]§r§f ";
@@ -214,7 +211,6 @@ class Main extends PluginBase implements Listener {
 		$cfg = new Config(LootTable::getPluginFolder() . "processingLoots.json", Config::JSON);
 		if($event->getBlock()->getId() !== Block::CHEST) return;
 		if(!$cfg->exists($event->getBlock()->getX() . ";" . $event->getBlock()->getY() . ";" . $event->getBlock()->getZ())) return;
-		$chest = new \pocketmine\block\Chest(0);
 		$nbt = new CompoundTag("", [
 				new ListTag("Items", []),
 				new StringTag("id", Tile::CHEST),
@@ -222,12 +218,10 @@ class Main extends PluginBase implements Listener {
 				new IntTag("y", $event->getBlock()->y),
 				new IntTag("z", $event->getBlock()->z)
 		]);
-		$chest->setLevel($event->getBlock()->getLevel());
-		$cItem = Item::get(Item::CHEST, 0);
-		$cItem->setCustomName("§k(Fake)§r Minecart chest");
-		$chest->place($cItem, $event->getBlock()->getLevel()->getBlock($event->getBlock()), $chest, 0, 0, 0, 0);
-		$inv = $event->getBlock()->getLevel()->getTile($event->getBlock());
-		LootTable::fillChest($inv->getInventory(), $event->getBlock());
+		/** @var Chest $chest */
+		$chest = Tile::createTile(Tile::CHEST, $event->getBlock()->getLevel(), $nbt);
+		$chest->setName("§k(Fake)§r Minecart chest");
+		LootTable::fillChest($chest->getInventory(), $event->getBlock());
 	}
 	
 	
@@ -238,21 +232,18 @@ class Main extends PluginBase implements Listener {
 		$cfg = new Config(LootTable::getPluginFolder() . "processingLoots.json", Config::JSON);
 		if($event->getBlock()->getId() !== Block::CHEST) return;
 		if(!$cfg->exists($event->getBlock()->getX() . ";" . $event->getBlock()->getY() . ";" . $event->getBlock()->getZ())) return;
-		$chest = new \pocketmine\block\Chest(0);
 		$nbt = new CompoundTag("", [
-				new ListTag("Items", []),
-				new StringTag("id", Tile::CHEST),
-				new IntTag("x", $event->getBlock()->x),
-				new IntTag("y", $event->getBlock()->y),
-				new IntTag("z", $event->getBlock()->z)
+			new ListTag("Items", []),
+			new StringTag("id", Tile::CHEST),
+			new IntTag("x", $event->getBlock()->x),
+			new IntTag("y", $event->getBlock()->y),
+			new IntTag("z", $event->getBlock()->z)
 		]);
-		$chest->setLevel($event->getBlock()->getLevel());
-		$cItem = Item::get(Item::CHEST, 0);
-		$cItem->setCustomName("§k(Fake)§r Minecart chest");
-		$chest->place($cItem, $event->getBlock()->getLevel()->getBlock($event->getBlock()), $chest, 0, 0, 0, 0);
-		$inv = $event->getBlock()->getLevel()->getTile($event->getBlock());
-		LootTable::fillChest($inv->getInventory(), $event->getBlock());
-		$event->setCancelled();
+		/** @var Chest $chest */
+		$chest = Tile::createTile(Tile::CHEST, $event->getBlock()->getLevel(), $nbt);
+		$chest->setName("§k(Fake)§r Minecart chest");
+		LootTable::fillChest($chest->getInventory(), $event->getBlock());
+		// $event->setCancelled(); //i think nope. You want to break it with items
 	}
 
 	/*
diff --git a/src/Ad5001/BetterGen/biome/BetterDesert.php b/src/Ad5001/BetterGen/biome/BetterDesert.php
index f33e7fc..ee5e2e7 100644
--- a/src/Ad5001/BetterGen/biome/BetterDesert.php
+++ b/src/Ad5001/BetterGen/biome/BetterDesert.php
@@ -13,14 +13,14 @@
  */
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SandyBiome;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use Ad5001\BetterGen\populator\TemplePopulator;
-use Ad5001\BetterGen\populator\WellPopulator;
 use Ad5001\BetterGen\populator\CactusPopulator;
 use Ad5001\BetterGen\populator\DeadbushPopulator;
 use Ad5001\BetterGen\populator\SugarCanePopulator;
+use Ad5001\BetterGen\populator\TemplePopulator;
+use Ad5001\BetterGen\populator\WellPopulator;
+use pocketmine\block\Block;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\normal\biome\SandyBiome;
 
 class BetterDesert extends SandyBiome implements Mountainable {
 	public function __construct() {
diff --git a/src/Ad5001/BetterGen/biome/BetterForest.php b/src/Ad5001/BetterGen/biome/BetterForest.php
index 69db0e0..f50868d 100644
--- a/src/Ad5001/BetterGen/biome/BetterForest.php
+++ b/src/Ad5001/BetterGen/biome/BetterForest.php
@@ -15,12 +15,12 @@
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\ForestBiome;
-use pocketmine\level\generator\biome\Biome;
 use Ad5001\BetterGen\Main;
-use Ad5001\BetterGen\populator\TreePopulator;
 use Ad5001\BetterGen\populator\BushPopulator;
 use Ad5001\BetterGen\populator\FallenTreePopulator;
+use Ad5001\BetterGen\populator\TreePopulator;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\normal\biome\ForestBiome;
 
 
 class BetterForest extends ForestBiome implements Mountainable {
diff --git a/src/Ad5001/BetterGen/biome/BetterIcePlains.php b/src/Ad5001/BetterGen/biome/BetterIcePlains.php
index e4e5529..6700eae 100644
--- a/src/Ad5001/BetterGen/biome/BetterIcePlains.php
+++ b/src/Ad5001/BetterGen/biome/BetterIcePlains.php
@@ -14,11 +14,11 @@
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SnowyBiome;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use Ad5001\BetterGen\populator\IglooPopulator;
 use Ad5001\BetterGen\Main;
+use Ad5001\BetterGen\populator\IglooPopulator;
+use pocketmine\block\Block;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\normal\biome\SnowyBiome;
 
 class BetterIcePlains extends SnowyBiome implements Mountainable {
 	public function __construct() {
diff --git a/src/Ad5001/BetterGen/biome/BetterMesa.php b/src/Ad5001/BetterGen/biome/BetterMesa.php
index 2976d70..e82460b 100644
--- a/src/Ad5001/BetterGen/biome/BetterMesa.php
+++ b/src/Ad5001/BetterGen/biome/BetterMesa.php
@@ -14,17 +14,14 @@
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SandyBiome;
-use pocketmine\level\generator\populator\Ore;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use pocketmine\block\GoldOre;
 use Ad5001\BetterGen\Main;
-use Ad5001\BetterGen\populator\TreePopulator;
 use Ad5001\BetterGen\populator\CactusPopulator;
 use Ad5001\BetterGen\populator\DeadbushPopulator;
 use Ad5001\BetterGen\populator\SugarCanePopulator;
+use Ad5001\BetterGen\populator\TreePopulator;
+use pocketmine\block\Block;
+use pocketmine\block\GoldOre;
+use pocketmine\level\generator\normal\biome\SandyBiome;
 
 class BetterMesa extends SandyBiome {
 	public function __construct() {
diff --git a/src/Ad5001/BetterGen/biome/BetterMesaPlains.php b/src/Ad5001/BetterGen/biome/BetterMesaPlains.php
index cb700f3..610e972 100644
--- a/src/Ad5001/BetterGen/biome/BetterMesaPlains.php
+++ b/src/Ad5001/BetterGen/biome/BetterMesaPlains.php
@@ -14,15 +14,13 @@
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\normal\biome\SandyBiome;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\block\Block;
-use pocketmine\block\GoldOre;
+use Ad5001\BetterGen\Main;
 use Ad5001\BetterGen\populator\CactusPopulator;
 use Ad5001\BetterGen\populator\DeadbushPopulator;
 use Ad5001\BetterGen\populator\SugarCanePopulator;
-use Ad5001\BetterGen\Main;
+use pocketmine\block\Block;
+use pocketmine\block\GoldOre;
+use pocketmine\level\generator\normal\biome\SandyBiome;
 
 class BetterMesaPlains extends SandyBiome {
 	public function __construct() {
diff --git a/src/Ad5001/BetterGen/biome/BetterRiver.php b/src/Ad5001/BetterGen/biome/BetterRiver.php
index ea18996..b6f7df2 100644
--- a/src/Ad5001/BetterGen/biome/BetterRiver.php
+++ b/src/Ad5001/BetterGen/biome/BetterRiver.php
@@ -14,8 +14,8 @@
 
 namespace Ad5001\BetterGen\biome;
 
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\block\Block;
+use pocketmine\level\generator\biome\Biome;
 
 class BetterRiver extends Biome {
 	public function __construct() {
diff --git a/src/Ad5001/BetterGen/generator/BetterBiomeSelector.php b/src/Ad5001/BetterGen/generator/BetterBiomeSelector.php
index 48debb5..a87a300 100644
--- a/src/Ad5001/BetterGen/generator/BetterBiomeSelector.php
+++ b/src/Ad5001/BetterGen/generator/BetterBiomeSelector.php
@@ -13,10 +13,10 @@
 */
 namespace Ad5001\BetterGen\generator;
 
-use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\biome\Biome;
-use pocketmine\utils\Random;
+use pocketmine\level\generator\biome\BiomeSelector;
 use pocketmine\level\generator\noise\Simplex;
+use pocketmine\utils\Random;
 
 class BetterBiomeSelector extends BiomeSelector {
 	
@@ -30,7 +30,6 @@ class BetterBiomeSelector extends BiomeSelector {
 	
 	/** @var Biome[] */
 	private $biomes = [ ];
-	private $map = [ ];
 	private $lookup;
 	public function __construct(Random $random, callable $lookup, Biome $fallback) {
 		parent::__construct($random, $lookup, $fallback);
diff --git a/src/Ad5001/BetterGen/generator/BetterNormal.php b/src/Ad5001/BetterGen/generator/BetterNormal.php
index 3b88849..7cd9464 100644
--- a/src/Ad5001/BetterGen/generator/BetterNormal.php
+++ b/src/Ad5001/BetterGen/generator/BetterNormal.php
@@ -14,15 +14,18 @@
 
 namespace Ad5001\BetterGen\generator;
 
-use pocketmine\level\ChunkManager;
-use pocketmine\math\Vector3;
-use pocketmine\utils\Random;
-use pocketmine\level\generator\biome\Biome;
-use pocketmine\level\generator\Generator;
-use pocketmine\level\generator\noise\Simplex;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\normal\object\OreType as OreType2;
-use pocketmine\level\generator\populator\Ore;
+use Ad5001\BetterGen\biome\BetterDesert;
+use Ad5001\BetterGen\biome\BetterForest;
+use Ad5001\BetterGen\biome\BetterIcePlains;
+use Ad5001\BetterGen\biome\BetterMesa;
+use Ad5001\BetterGen\biome\BetterMesaPlains;
+use Ad5001\BetterGen\biome\BetterRiver;
+use Ad5001\BetterGen\biome\Mountainable;
+use Ad5001\BetterGen\Main;
+use Ad5001\BetterGen\populator\CavePopulator;
+use Ad5001\BetterGen\populator\FloatingIslandPopulator;
+use Ad5001\BetterGen\populator\MineshaftPopulator;
+use Ad5001\BetterGen\populator\RavinePopulator;
 use pocketmine\block\Block;
 use pocketmine\block\CoalOre;
 use pocketmine\block\DiamondOre;
@@ -32,20 +35,15 @@ use pocketmine\block\Gravel;
 use pocketmine\block\IronOre;
 use pocketmine\block\LapisOre;
 use pocketmine\block\RedstoneOre;
+use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\biome\Biome;
+use pocketmine\level\generator\Generator;
+use pocketmine\level\generator\noise\Simplex;
+use pocketmine\level\generator\normal\object\OreType as OreType2;
+use pocketmine\level\generator\object\OreType;
 use pocketmine\level\Level;
-use Ad5001\BetterGen\biome\BetterForest;
-use Ad5001\BetterGen\biome\BetterDesert;
-use Ad5001\BetterGen\biome\BetterIcePlains;
-use Ad5001\BetterGen\biome\BetterMesa;
-use Ad5001\BetterGen\biome\BetterMesaPlains;
-use Ad5001\BetterGen\biome\BetterRiver;
-use Ad5001\BetterGen\biome\Mountainable;
-use Ad5001\BetterGen\populator\CavePopulator;
-use Ad5001\BetterGen\populator\RavinePopulator;
-use Ad5001\BetterGen\populator\LakePopulator;
-use Ad5001\BetterGen\populator\MineshaftPopulator;
-use Ad5001\BetterGen\populator\FloatingIslandPopulator;
-use Ad5001\BetterGen\Main;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class BetterNormal extends Generator {
 	const NOT_OVERWRITABLE = [
@@ -61,9 +59,11 @@ class BetterNormal extends Generator {
 			Block::WATER,
 			Block::STILL_WATER 
 	];
+	/** @var BetterBiomeSelector */
 	protected $selector;
 	/** @var Level */
 	protected $level;
+	/** @var Random */
 	protected $random;
 	protected $populators = [ ];
 	protected $generationPopulators = [ ];
@@ -78,7 +78,8 @@ class BetterNormal extends Generator {
 		]
 	];
 	protected $waterHeight = 63;
-	
+	private $noiseBase;
+
 	/*
 	 * Picks a biome by X and Z
 	 * @param	$x	int
diff --git a/src/Ad5001/BetterGen/loot/LootTable.php b/src/Ad5001/BetterGen/loot/LootTable.php
index 2f1ab26..24c0cdf 100644
--- a/src/Ad5001/BetterGen/loot/LootTable.php
+++ b/src/Ad5001/BetterGen/loot/LootTable.php
@@ -14,12 +14,12 @@
 
 namespace Ad5001\BetterGen\loot;
 
+use pocketmine\inventory\BaseInventory;
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\NBT;
 use pocketmine\utils\Config;
 use pocketmine\utils\Random;
-use pocketmine\math\Vector3;
-use pocketmine\item\Item;
-use pocketmine\inventory\BaseInventory;
-use pocketmine\nbt\NBT;
 
 /*
  * This class is used for loot setting.
diff --git a/src/Ad5001/BetterGen/populator/AmountPopulator.php b/src/Ad5001/BetterGen/populator/AmountPopulator.php
index 6ae8765..aee3766 100644
--- a/src/Ad5001/BetterGen/populator/AmountPopulator.php
+++ b/src/Ad5001/BetterGen/populator/AmountPopulator.php
@@ -14,8 +14,8 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\utils\Random;
 use pocketmine\level\generator\populator\Populator;
+use pocketmine\utils\Random;
 
 abstract class AmountPopulator extends Populator {
 	protected $baseAmount = 0;
diff --git a/src/Ad5001/BetterGen/populator/BushPopulator.php b/src/Ad5001/BetterGen/populator/BushPopulator.php
index 765166c..65c64cd 100644
--- a/src/Ad5001/BetterGen/populator/BushPopulator.php
+++ b/src/Ad5001/BetterGen/populator/BushPopulator.php
@@ -14,13 +14,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Bush;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\populator\TreePopulator;
-use Ad5001\BetterGen\populator\AmountPopulator;
-use Ad5001\BetterGen\structure\Bush;
+use pocketmine\level\Level;
+use pocketmine\utils\Random;
 
 class BushPopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/CactusPopulator.php b/src/Ad5001/BetterGen/populator/CactusPopulator.php
index d1802a4..cc7b7c7 100644
--- a/src/Ad5001/BetterGen/populator/CactusPopulator.php
+++ b/src/Ad5001/BetterGen/populator/CactusPopulator.php
@@ -15,12 +15,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\structure\Cactus;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\Cactus;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class CactusPopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/CavePopulator.php b/src/Ad5001/BetterGen/populator/CavePopulator.php
index fb5ab45..60682a8 100644
--- a/src/Ad5001/BetterGen/populator/CavePopulator.php
+++ b/src/Ad5001/BetterGen/populator/CavePopulator.php
@@ -14,13 +14,12 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\math\Vector3;
-use Ad5001\BetterGen\utils\BuildingUtils;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\utils\Random;
 
 class CavePopulator extends AmountPopulator {
 	/** @var ChunkManager */
@@ -93,7 +92,7 @@ class CavePopulator extends AmountPopulator {
 		foreach($gen = $this->generateBranch($x, $y, $z, 5, 3, 5, $random ) as $v3 ) {
 			$generatedBranches --;
 			if ($generatedBranches <= 0) {
-				$gen->send(self::STOP);
+				$gen->send(self::STOP); // send not found.. @Ad5001 what is that
 			} else {
 				$gen->send(self::CONTINUE);
 			}
diff --git a/src/Ad5001/BetterGen/populator/DeadbushPopulator.php b/src/Ad5001/BetterGen/populator/DeadbushPopulator.php
index edf583e..dee8bc2 100644
--- a/src/Ad5001/BetterGen/populator/DeadbushPopulator.php
+++ b/src/Ad5001/BetterGen/populator/DeadbushPopulator.php
@@ -18,7 +18,6 @@ use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class DeadbushPopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/FallenTreePopulator.php b/src/Ad5001/BetterGen/populator/FallenTreePopulator.php
index a16bcde..be8bd58 100644
--- a/src/Ad5001/BetterGen/populator/FallenTreePopulator.php
+++ b/src/Ad5001/BetterGen/populator/FallenTreePopulator.php
@@ -14,12 +14,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\structure\FallenTree;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\FallenTree;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 
 class FallenTreePopulator extends AmountPopulator {
diff --git a/src/Ad5001/BetterGen/populator/FloatingIslandPopulator.php b/src/Ad5001/BetterGen/populator/FloatingIslandPopulator.php
index 35c0e3a..3c2a600 100644
--- a/src/Ad5001/BetterGen/populator/FloatingIslandPopulator.php
+++ b/src/Ad5001/BetterGen/populator/FloatingIslandPopulator.php
@@ -14,22 +14,21 @@
  
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\ChunkManager;
-use pocketmine\level\format\Chunk;
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
 use Ad5001\BetterGen\generator\BetterNormal;
-use pocketmine\block\Block;
-use pocketmine\level\generator\object\OreType;
-use pocketmine\level\generator\normal\object\OreType as OreType2;
-use pocketmine\math\Vector3;
-use pocketmine\block\CoalOre;
-use pocketmine\block\IronOre;
-use pocketmine\block\RedstoneOre;
-use pocketmine\block\LapisOre;
-use pocketmine\block\GoldOre;
-use pocketmine\block\DiamondOre;
 use Ad5001\BetterGen\Main;
+use pocketmine\block\Block;
+use pocketmine\block\CoalOre;
+use pocketmine\block\DiamondOre;
+use pocketmine\block\GoldOre;
+use pocketmine\block\IronOre;
+use pocketmine\block\LapisOre;
+use pocketmine\block\RedstoneOre;
+use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\normal\object\OreType as OreType2;
+use pocketmine\level\generator\object\OreType;
+use pocketmine\level\Level;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 
 class FloatingIslandPopulator extends AmountPopulator {
@@ -162,6 +161,6 @@ class FloatingIslandPopulator extends AmountPopulator {
 				new OreType(new GoldOre (), 2, 8, $pos->y - $height, $pos->y - round($height / 2)),
 				new OreType(new DiamondOre (), 1, 7, $pos->y - $height, $pos->y - round($height / 4))
 		]);
-		$ores->populate($level, $x >> 4, $z >> 4, $random);//x z undefined
+		$ores->populate($level, $pos->x >> 4, $pos->z >> 4, $random);//x z undefined
 	}
 }
\ No newline at end of file
diff --git a/src/Ad5001/BetterGen/populator/IglooPopulator.php b/src/Ad5001/BetterGen/populator/IglooPopulator.php
index cc49f2e..b49cf60 100644
--- a/src/Ad5001/BetterGen/populator/IglooPopulator.php
+++ b/src/Ad5001/BetterGen/populator/IglooPopulator.php
@@ -14,12 +14,11 @@
  
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Igloo;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\populator\AmountPopulator;
-use Ad5001\BetterGen\structure\Igloo;
+use pocketmine\level\Level;
+use pocketmine\utils\Random;
 
 class IglooPopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/LakePopulator.php b/src/Ad5001/BetterGen/populator/LakePopulator.php
index 018e465..ee2194f 100644
--- a/src/Ad5001/BetterGen/populator/LakePopulator.php
+++ b/src/Ad5001/BetterGen/populator/LakePopulator.php
@@ -14,13 +14,12 @@
  
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\Level;
 use pocketmine\math\Vector3;
-use Ad5001\BetterGen\utils\BuildingUtils;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\utils\Random;
 
 class LakePopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/MineshaftPopulator.php b/src/Ad5001/BetterGen/populator/MineshaftPopulator.php
index 78e639b..c325063 100644
--- a/src/Ad5001/BetterGen/populator/MineshaftPopulator.php
+++ b/src/Ad5001/BetterGen/populator/MineshaftPopulator.php
@@ -14,12 +14,12 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
-use Ad5001\BetterGen\utils\BuildingUtils;
-use pocketmine\math\Vector3;
-use pocketmine\block\Block;
 use Ad5001\BetterGen\loot\LootTable;
+use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\block\Block;
+use pocketmine\level\ChunkManager;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class MineshaftPopulator extends AmountPopulator {
 	protected $maxPath;
@@ -131,13 +131,13 @@ class MineshaftPopulator extends AmountPopulator {
 						// First, filling everything blank.
 						BuildingUtils::fill($this->level, new Vector3($x, $y, $z - 1 ), new Vector3($x - 4, $y + 2, $z + 1 ));
 						// Then, making sure the floor is solid.
-						BuildingUtils::fillCallback(new Vector3($x, $y - 1, $z - 1 ), new Vector3($x - 4, $y - 1, $z + 1 ), function ($v3, $level) {
+						BuildingUtils::fillCallback(new Vector3($x, $y - 1, $z - 1 ), new Vector3($x - 4, $y - 1, $z + 1 ), function ($v3, ChunkManager $level) {
 							
 							if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 						}, $this->level);
 						// Putting rails
-						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x - 4, $y, $z ), function ($v3, $level, $random) {
+						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x - 4, $y, $z ), function ($v3, ChunkManager $level, Random $random) {
 							if ($random->nextBoundedInt(3 ) !== 0) {
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::RAIL);
 								$level->setBlockDataAt($v3->x, $v3->y, $v3->z, 1);
@@ -213,13 +213,13 @@ class MineshaftPopulator extends AmountPopulator {
 						// First, filling everything blank.
 						BuildingUtils::fill($this->level, new Vector3($x - 1, $y, $z ), new Vector3($x + 1, $y + 2, $z - 4 ));
 						// Then, making sure the floor is solid.
-						BuildingUtils::fillCallback(new Vector3($x - 1, $y - 1, $z ), new Vector3($x + 1, $y - 1, $z - 4 ), function ($v3, $level) {
+						BuildingUtils::fillCallback(new Vector3($x - 1, $y - 1, $z ), new Vector3($x + 1, $y - 1, $z - 4 ), function ($v3, ChunkManager $level) {
 							
 							if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 						}, $this->level);
 						// Putting rails
-						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x, $y, $z - 4 ), function ($v3, $level, $random) {
+						BuildingUtils::fillCallback(new Vector3($x, $y, $z ), new Vector3($x, $y, $z - 4 ), function ($v3, ChunkManager $level, Random $random) {
 							if ($random->nextBoundedInt(3 ) !== 0) {
 								$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::RAIL);
 								$level->setBlockDataAt($v3->x, $v3->y, $v3->z, 0);
@@ -310,7 +310,7 @@ class MineshaftPopulator extends AmountPopulator {
 								self::DIR_ZMIN 
 						] : [ ]) 
 				];
-				for($i = 7; $i > $newfloor; $i --) {
+				for($i = 7; $i > $newFloor; $i --) {
 					$chooseNew =(int ) $newFloor && $random->nextBoolean ();
 					$choose = $random->nextBoundedInt(4);
 					unset($possiblePathes [$chooseNew] [$choose]);
@@ -366,17 +366,17 @@ class MineshaftPopulator extends AmountPopulator {
 				}
 				// Building stairs
 				for($i = 0; $i < 4; $i ++) {
-					switch ($path) {
+					switch ($i) {
 						case self::DIR_XPLUS :
 							BuildingUtils::fill($this->level, new Vector3($x + $i, $y - $i - 1, $z - 2 ), new Vector3($x + $i, $y - $i + 3, $z + 2 ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x + $i, $y - $i - 2, $z - 2 ), new Vector3($x + $i, $y - $i - 2, $z + 2 ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x + $i, $y - $i - 2, $z - 2 ), new Vector3($x + $i, $y - $i - 2, $z + 2 ), function ($v3, ChunkManager $level) {
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
 							}, $this->level);
 							break;
 						case self::DIR_XMIN :
 							BuildingUtils::fill($this->level, new Vector3($x - $i, $y - $i - 1, $z - 2 ), new Vector3($x - $i, $y - $i + 3, $z + 2 ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x - $i, $y - $i - 2, $z - 2 ), new Vector3($x - $i, $y - $i - 2, $z + 2 ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x - $i, $y - $i - 2, $z - 2 ), new Vector3($x - $i, $y - $i - 2, $z + 2 ), function ($v3, ChunkManager $level) {
 								
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -384,7 +384,7 @@ class MineshaftPopulator extends AmountPopulator {
 							break;
 						case self::DIR_ZPLUS :
 							BuildingUtils::fill($this->level, new Vector3($x - 2, $y - $i - 1, $z + $i ), new Vector3($x + 2, $y - $i + 3, $z + $i ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z + $i ), new Vector3($x + 2, $y - $i - 2, $z + $i ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z + $i ), new Vector3($x + 2, $y - $i - 2, $z + $i ), function ($v3, ChunkManager $level) {
 								
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -392,7 +392,7 @@ class MineshaftPopulator extends AmountPopulator {
 							break;
 						case self::DIR_ZMIN :
 							BuildingUtils::fill($this->level, new Vector3($x - 2, $y - $i - 1, $z - $i ), new Vector3($x + 2, $y - $i + 3, $z - $i ), Block::get(Block::AIR ));
-							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z - $i ), new Vector3($x + 2, $y - $i - 2, $z - $i ), function ($v3, $level) {
+							BuildingUtils::fillCallback(new Vector3($x - 2, $y - $i - 2, $z - $i ), new Vector3($x + 2, $y - $i - 2, $z - $i ), function ($v3, ChunkManager $level) {
 								
 								if ($level->getBlockIdAt($v3->x, $v3->y, $v3->z ) == Block::AIR)
 									$level->setBlockIdAt($v3->x, $v3->y, $v3->z, Block::PLANK);
@@ -402,7 +402,7 @@ class MineshaftPopulator extends AmountPopulator {
 				}
 				
 				// Next one
-				switch ($path) {
+				switch ($i) {
 					case self::DIR_XPLUS :
 						$this->generateMineshaftPart($x + 4, $y - 4, $z, self::DIR_XPLUS, $random);
 						break;
diff --git a/src/Ad5001/BetterGen/populator/RavinePopulator.php b/src/Ad5001/BetterGen/populator/RavinePopulator.php
index ce1c47c..ac75a31 100644
--- a/src/Ad5001/BetterGen/populator/RavinePopulator.php
+++ b/src/Ad5001/BetterGen/populator/RavinePopulator.php
@@ -14,12 +14,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\utils\BuildingUtils;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\populator\AmountPopulator;
-use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\level\Level;
+use pocketmine\utils\Random;
 
 class RavinePopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/SugarCanePopulator.php b/src/Ad5001/BetterGen/populator/SugarCanePopulator.php
index 1ac6c15..1241835 100644
--- a/src/Ad5001/BetterGen/populator/SugarCanePopulator.php
+++ b/src/Ad5001/BetterGen/populator/SugarCanePopulator.php
@@ -14,12 +14,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\structure\SugarCane;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\structure\SugarCane;
-use Ad5001\BetterGen\populator\AmountPopulator;
 
 class SugarCanePopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/populator/TemplePopulator.php b/src/Ad5001/BetterGen/populator/TemplePopulator.php
index 24d1d52..cad160a 100644
--- a/src/Ad5001/BetterGen/populator/TemplePopulator.php
+++ b/src/Ad5001/BetterGen/populator/TemplePopulator.php
@@ -14,12 +14,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Temple;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\structure\Temple;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\level\Level;
+use pocketmine\utils\Random;
 
 class TemplePopulator extends AmountPopulator {
 	/** @var  Level */
diff --git a/src/Ad5001/BetterGen/populator/TreePopulator.php b/src/Ad5001/BetterGen/populator/TreePopulator.php
index d8edd40..e5f93ec 100644
--- a/src/Ad5001/BetterGen/populator/TreePopulator.php
+++ b/src/Ad5001/BetterGen/populator/TreePopulator.php
@@ -14,14 +14,12 @@
 
 namespace Ad5001\BetterGen\populator;
 
+use Ad5001\BetterGen\Main;
+use pocketmine\block\Block;
+use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\object\Tree;
 use pocketmine\level\Level;
 use pocketmine\utils\Random;
-use pocketmine\block\Block;
-use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\structure\SakuraTree;
-use Ad5001\BetterGen\populator\AmountPopulator;
-use Ad5001\BetterGen\Main;
 
 
 class TreePopulator extends AmountPopulator {
diff --git a/src/Ad5001/BetterGen/populator/WellPopulator.php b/src/Ad5001/BetterGen/populator/WellPopulator.php
index 664b242..5555b33 100644
--- a/src/Ad5001/BetterGen/populator/WellPopulator.php
+++ b/src/Ad5001/BetterGen/populator/WellPopulator.php
@@ -14,12 +14,11 @@
 
 namespace Ad5001\BetterGen\populator;
 
-use pocketmine\level\Level;
-use pocketmine\utils\Random;
+use Ad5001\BetterGen\structure\Well;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use Ad5001\BetterGen\structure\Well;
-use Ad5001\BetterGen\populator\AmountPopulator;
+use pocketmine\level\Level;
+use pocketmine\utils\Random;
 
 class WellPopulator extends AmountPopulator {
 	/** @var ChunkManager */
diff --git a/src/Ad5001/BetterGen/structure/Bush.php b/src/Ad5001/BetterGen/structure/Bush.php
index 022ba97..796636d 100644
--- a/src/Ad5001/BetterGen/structure/Bush.php
+++ b/src/Ad5001/BetterGen/structure/Bush.php
@@ -14,12 +14,11 @@
 
 namespace Ad5001\BetterGen\structure;
 
-use pocketmine\block\Leaves;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
-use pocketmine\math\Vector3;
 use pocketmine\level\generator\object\Object;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class Bush extends Object {
 	public $overridable = [
diff --git a/src/Ad5001/BetterGen/structure/Cactus.php b/src/Ad5001/BetterGen/structure/Cactus.php
index 4e01f0d..27cf28c 100644
--- a/src/Ad5001/BetterGen/structure/Cactus.php
+++ b/src/Ad5001/BetterGen/structure/Cactus.php
@@ -15,9 +15,9 @@
 namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
-use pocketmine\utils\Random;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 class Cactus extends Object {
 	
@@ -29,10 +29,12 @@ class Cactus extends Object {
 	 * @param $z int
 	 * @param $random pocketmine\utils\Random
 	 */
+	private $totalHeight;
+
 	public function canPlaceObject(ChunkManager $level, int $x, int $y, int $z, Random $random): bool {
 		$this->totalHeight = 1 + $random->nextBoundedInt(3);
 		$below = $level->getBlockIdAt($x, $y - 1, $z);
-		for($yy = $y; $yy <= $y + $totalHeight; $yy ++) {
+		for($yy = $y; $yy <= $y + $this->totalHeight; $yy ++) {
 			if ($level->getBlockIdAt($x, $yy, $z ) !== Block::AIR || ($below !== Block::SAND && $below !== Block::CACTUS) || ($level->getBlockIdAt($x - 1, $yy, $z ) !== Block::AIR || $level->getBlockIdAt($x + 1, $yy, $z ) !== Block::AIR || $level->getBlockIdAt($x, $yy, $z - 1 ) !== Block::AIR || $level->getBlockIdAt($x, $yy, $z + 1 ) !== Block::AIR)) {
 				return false;
 			}
diff --git a/src/Ad5001/BetterGen/structure/Igloo.php b/src/Ad5001/BetterGen/structure/Igloo.php
index 8617d4b..d76fdac 100644
--- a/src/Ad5001/BetterGen/structure/Igloo.php
+++ b/src/Ad5001/BetterGen/structure/Igloo.php
@@ -16,8 +16,8 @@ namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 class Igloo extends Object {
 	public $overridable = [ 
diff --git a/src/Ad5001/BetterGen/structure/SakuraTree.php b/src/Ad5001/BetterGen/structure/SakuraTree.php
index d40cb06..f67d56a 100644
--- a/src/Ad5001/BetterGen/structure/SakuraTree.php
+++ b/src/Ad5001/BetterGen/structure/SakuraTree.php
@@ -1,10 +1,10 @@
 <?php
 /**
- *  ____             __     __                    ____                       
- * /\  _`\          /\ \__ /\ \__                /\  _`\                     
- * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
- *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
- *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *  ____             __     __                    ____
+ * /\  _`\          /\ \__ /\ \__                /\  _`\
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \
  *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
  *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
  * Tomorrow's pocketmine generator.
@@ -14,12 +14,14 @@
 
 namespace Ad5001\BetterGen\structure;
 
+use Ad5001\BetterGen\Main;
 use pocketmine\block\Block;
 use pocketmine\block\Wood;
 use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\object\Tree;
 use pocketmine\utils\Random;
-use Ad5001\BetterGen\Main;
-if(Main::isOtherNS()) {
+
+if (Main::isOtherNS()) {
 	class_alias("pocketmine\\level\\generator\\normal\\object\\Tree", "Ad5001\\BetterGen\\structure\\Tree");
 } else {
 	class_alias("pocketmine\\level\\generator\\object\\Tree", "Ad5001\\BetterGen\\structure\\Tree");
@@ -27,420 +29,422 @@ if(Main::isOtherNS()) {
 
 class SakuraTree extends Tree {
 	const TRUNK_POS = [  // Checks for trees trunks. Not automatically generated but there is no point of making more or less
-			7 => [ 
-					0,
-					1 
-			], // 0 vertical, 1 horizontal and same goes for others...
-			8 => [ 
-					1,
-					0 
-			],
-			9 => [ 
-					1,
-					1 
-			],
-			10 => [ 
-					2,
-					0 
-			],
-			11 => [ 
-					2,
-					1 
-			],
-			12 => [ 
-					2,
-					2 
-			],
-			13 => [ 
-					3,
-					1 
-			] 
+		7 => [
+			0,
+			1
+		], // 0 vertical, 1 horizontal and same goes for others...
+		8 => [
+			1,
+			0
+		],
+		9 => [
+			1,
+			1
+		],
+		10 => [
+			2,
+			0
+		],
+		11 => [
+			2,
+			1
+		],
+		12 => [
+			2,
+			2
+		],
+		13 => [
+			3,
+			1
+		]
 	];
 	const DIAG_LEAVES = [  // Diag poses of the leaves based on the height of the tree.X relative to $lastX and Z from $lastZ
-			7 => [ 
-					[ 
-							4,
-							4 
-					],
-					[ 
-							- 4,
-							4 
-					],
-					[ 
-							4,
-							- 4 
-					],
-					[ 
-							- 4,
-							- 4 
-					] 
+		7 => [
+			[
+				4,
+				4
 			],
-			8 => [ 
-					[ 
-							6,
-							6 
-					],
-					[ 
-							- 6,
-							6 
-					],
-					[ 
-							6,
-							- 6 
-					],
-					[ 
-							- 6,
-							- 6 
-					] 
+			[
+				-4,
+				4
 			],
-			9 => [ 
-					[ 
-							6,
-							6 
-					],
-					[ 
-							- 6,
-							6 
-					],
-					[ 
-							6,
-							- 6 
-					],
-					[ 
-							- 6,
-							- 6 
-					] 
+			[
+				4,
+				-4
 			],
-			10 => [ 
-					[ 
-							6,
-							6 
-					],
-					[ 
-							- 6,
-							6 
-					],
-					[ 
-							6,
-							- 6 
-					],
-					[ 
-							- 6,
-							- 6 
-					] 
+			[
+				-4,
+				-4
+			]
+		],
+		8 => [
+			[
+				6,
+				6
 			],
-			11 => [ 
-					[ 
-							7,
-							7 
-					],
-					[ 
-							6,
-							8 
-					],
-					[ 
-							8,
-							6 
-					],
-					[ 
-							- 7,
-							7 
-					],
-					[ 
-							- 6,
-							8 
-					],
-					[ 
-							- 8,
-							6 
-					],
-					[ 
-							7,
-							- 7 
-					],
-					[ 
-							6,
-							- 8 
-					],
-					[ 
-							8,
-							- 6 
-					],
-					[ 
-							- 7,
-							- 7 
-					],
-					[ 
-							- 6,
-							- 8 
-					],
-					[ 
-							- 8,
-							- 6 
-					] 
+			[
+				-6,
+				6
 			],
-			12 => [ 
-					[ 
-							7,
-							7 
-					],
-					[ 
-							6,
-							8 
-					],
-					[ 
-							8,
-							6 
-					],
-					[ 
-							- 7,
-							7 
-					],
-					[ 
-							- 6,
-							8 
-					],
-					[ 
-							- 8,
-							6 
-					],
-					[ 
-							7,
-							- 7 
-					],
-					[ 
-							6,
-							- 8 
-					],
-					[ 
-							8,
-							- 6 
-					],
-					[ 
-							- 7,
-							- 7 
-					],
-					[ 
-							- 6,
-							- 8 
-					],
-					[ 
-							- 8,
-							- 6 
-					] 
+			[
+				6,
+				-6
 			],
-			13 => [ 
-					[ 
-							7,
-							7 
-					],
-					[ 
-							6,
-							8 
-					],
-					[ 
-							8,
-							6 
-					],
-					[ 
-							- 7,
-							7 
-					],
-					[ 
-							- 6,
-							8 
-					],
-					[ 
-							- 8,
-							6 
-					],
-					[ 
-							7,
-							- 7 
-					],
-					[ 
-							6,
-							- 8 
-					],
-					[ 
-							8,
-							- 6 
-					],
-					[ 
-							- 7,
-							- 7 
-					],
-					[ 
-							- 6,
-							- 8 
-					],
-					[ 
-							- 8,
-							- 6 
-					] 
-			] 
+			[
+				-6,
+				-6
+			]
+		],
+		9 => [
+			[
+				6,
+				6
+			],
+			[
+				-6,
+				6
+			],
+			[
+				6,
+				-6
+			],
+			[
+				-6,
+				-6
+			]
+		],
+		10 => [
+			[
+				6,
+				6
+			],
+			[
+				-6,
+				6
+			],
+			[
+				6,
+				-6
+			],
+			[
+				-6,
+				-6
+			]
+		],
+		11 => [
+			[
+				7,
+				7
+			],
+			[
+				6,
+				8
+			],
+			[
+				8,
+				6
+			],
+			[
+				-7,
+				7
+			],
+			[
+				-6,
+				8
+			],
+			[
+				-8,
+				6
+			],
+			[
+				7,
+				-7
+			],
+			[
+				6,
+				-8
+			],
+			[
+				8,
+				-6
+			],
+			[
+				-7,
+				-7
+			],
+			[
+				-6,
+				-8
+			],
+			[
+				-8,
+				-6
+			]
+		],
+		12 => [
+			[
+				7,
+				7
+			],
+			[
+				6,
+				8
+			],
+			[
+				8,
+				6
+			],
+			[
+				-7,
+				7
+			],
+			[
+				-6,
+				8
+			],
+			[
+				-8,
+				6
+			],
+			[
+				7,
+				-7
+			],
+			[
+				6,
+				-8
+			],
+			[
+				8,
+				-6
+			],
+			[
+				-7,
+				-7
+			],
+			[
+				-6,
+				-8
+			],
+			[
+				-8,
+				-6
+			]
+		],
+		13 => [
+			[
+				7,
+				7
+			],
+			[
+				6,
+				8
+			],
+			[
+				8,
+				6
+			],
+			[
+				-7,
+				7
+			],
+			[
+				-6,
+				8
+			],
+			[
+				-8,
+				6
+			],
+			[
+				7,
+				-7
+			],
+			[
+				6,
+				-8
+			],
+			[
+				8,
+				-6
+			],
+			[
+				-7,
+				-7
+			],
+			[
+				-6,
+				-8
+			],
+			[
+				-8,
+				-6
+			]
+		]
 	];
 	const ADDITIONAL_BLOCKS = [  // Blocks who aren't set to fully fill the tree. X relative to $lastX and Z from $lastZ
-			7 => [ ],
-			8 => [ ],
-			9 => [ ],
-			10 => [ ],
-			11 => [ 
-					[ 
-							6,
-							6 
-					],
-					[ 
-							7,
-							6 
-					],
-					[ 
-							6,
-							7 
-					],
-					[ 
-							- 6,
-							6 
-					],
-					[ 
-							- 7,
-							6 
-					],
-					[ 
-							- 6,
-							7 
-					],
-					[ 
-							6,
-							- 6 
-					],
-					[ 
-							7,
-							- 6 
-					],
-					[ 
-							6,
-							- 7 
-					],
-					[ 
-							- 6,
-							- 6 
-					],
-					[ 
-							- 7,
-							- 6 
-					],
-					[ 
-							- 6,
-							- 7 
-					] 
+		7 => [],
+		8 => [],
+		9 => [],
+		10 => [],
+		11 => [
+			[
+				6,
+				6
 			],
-			12 => [ 
-					[ 
-							6,
-							6 
-					],
-					[ 
-							7,
-							6 
-					],
-					[ 
-							6,
-							7 
-					],
-					[ 
-							- 6,
-							6 
-					],
-					[ 
-							- 7,
-							6 
-					],
-					[ 
-							- 6,
-							7 
-					],
-					[ 
-							6,
-							- 6 
-					],
-					[ 
-							7,
-							- 6 
-					],
-					[ 
-							6,
-							- 7 
-					],
-					[ 
-							- 6,
-							- 6 
-					],
-					[ 
-							- 7,
-							- 6 
-					],
-					[ 
-							- 6,
-							- 7 
-					] 
+			[
+				7,
+				6
 			],
-			13 => [ 
-					[ 
-							6,
-							6 
-					],
-					[ 
-							7,
-							6 
-					],
-					[ 
-							6,
-							7 
-					],
-					[ 
-							- 6,
-							6 
-					],
-					[ 
-							- 7,
-							6 
-					],
-					[ 
-							- 6,
-							7 
-					],
-					[ 
-							6,
-							- 6 
-					],
-					[ 
-							7,
-							- 6 
-					],
-					[ 
-							6,
-							- 7 
-					],
-					[ 
-							- 6,
-							- 6 
-					],
-					[ 
-							- 7,
-							- 6 
-					],
-					[ 
-							- 6,
-							- 7 
-					] 
-			] 
+			[
+				6,
+				7
+			],
+			[
+				-6,
+				6
+			],
+			[
+				-7,
+				6
+			],
+			[
+				-6,
+				7
+			],
+			[
+				6,
+				-6
+			],
+			[
+				7,
+				-6
+			],
+			[
+				6,
+				-7
+			],
+			[
+				-6,
+				-6
+			],
+			[
+				-7,
+				-6
+			],
+			[
+				-6,
+				-7
+			]
+		],
+		12 => [
+			[
+				6,
+				6
+			],
+			[
+				7,
+				6
+			],
+			[
+				6,
+				7
+			],
+			[
+				-6,
+				6
+			],
+			[
+				-7,
+				6
+			],
+			[
+				-6,
+				7
+			],
+			[
+				6,
+				-6
+			],
+			[
+				7,
+				-6
+			],
+			[
+				6,
+				-7
+			],
+			[
+				-6,
+				-6
+			],
+			[
+				-7,
+				-6
+			],
+			[
+				-6,
+				-7
+			]
+		],
+		13 => [
+			[
+				6,
+				6
+			],
+			[
+				7,
+				6
+			],
+			[
+				6,
+				7
+			],
+			[
+				-6,
+				6
+			],
+			[
+				-7,
+				6
+			],
+			[
+				-6,
+				7
+			],
+			[
+				6,
+				-6
+			],
+			[
+				7,
+				-6
+			],
+			[
+				6,
+				-7
+			],
+			[
+				-6,
+				-6
+			],
+			[
+				-7,
+				-6
+			],
+			[
+				-6,
+				-7
+			]
+		]
 	];
 	const maxPerChunk = 2;
 
 
 	public $trunkHeight = 11;
-	
+	private $leafType;
+	private $leaf2Type;
+
 	/*
 	 * Constructs the class
 	 */
@@ -451,7 +455,7 @@ class SakuraTree extends Tree {
 		$this->leaf2Type = 0;
 		$this->type = Wood::OAK;
 	}
-	
+
 	/*
 	 * Builds the tree.
 	 * @param $level \pocketmine\level\ChunkManager
@@ -466,7 +470,9 @@ class SakuraTree extends Tree {
 			return;
 		}
 		$trunkHeight = 7 + $random->nextBoundedInt(7);
-		
+
+		$xDiff = $zDiff = 0;
+
 		$direction = $random->nextBoundedInt(3); // Choosing building north east west south
 		switch ($direction) {
 			case 0 :
@@ -486,35 +492,35 @@ class SakuraTree extends Tree {
 				$zDiff = 0;
 				break;
 		}
-		list($vParts, $hParts ) = self::TRUNK_POS [$trunkHeight];
-		
+		list($vParts, $hParts) = self::TRUNK_POS [$trunkHeight];
+
 		$this->setLog($level, $x, $y, $z);
-		list($lastX, $lastY, $lastZ ) = [ 
-				$x,
-				$y,
-				$z 
+		list($lastX, $lastY, $lastZ) = [
+			$x,
+			$y,
+			$z
 		];
-		
+
 		// Filling horizontally
 		if ($hParts > 0) {
-			for($i = 0; $i < $hParts; $i ++) {
+			for ($i = 0; $i < $hParts; $i++) {
 				$lastX += $xDiff * 2;
-				$lastY ++;
+				$lastY++;
 				$lastZ += $zDiff * 2;
 				$this->setLog($level, $lastX - $xDiff, $lastY, $lastZ - $zDiff);
 				$this->setLog($level, $lastX, $lastY, $lastZ);
 			}
 		}
-		
+
 		// The middle block
 		$lastX += $xDiff;
-		$lastY ++;
+		$lastY++;
 		$lastZ += $zDiff;
 		$this->setLog($level, $lastX, $lastY, $lastZ);
-		
+
 		// Filling vertically
 		if ($vParts > 0) {
-			for($i = 0; $i < $vParts; $i ++) {
+			for ($i = 0; $i < $vParts; $i++) {
 				$lastX += $xDiff;
 				$lastY += 2;
 				$lastZ += $zDiff;
@@ -524,18 +530,20 @@ class SakuraTree extends Tree {
 		}
 		// Filling the top trunk.
 		$lastX += $xDiff;
-		$lastY ++;
+		$lastY++;
 		$lastZ += $zDiff;
-		for($i = 0; $i < 4; $i ++) {
+		for ($i = 0; $i < 4; $i++) {
 			$this->setLog($level, $lastX, $lastY + $i, $lastZ);
 		}
-		$lastY ++;
+		$lastY++;
 		// Filling the branches.
 		$branchLen2 = function ($base) {
 			return ceil($base / 2);
 		};
-		
-		for($dir = 0; $dir < 4; $dir ++) {
+
+		$xd = $zd = 0;
+
+		for ($dir = 0; $dir < 4; $dir++) {
 			switch ($dir) {
 				case 0 :
 					$xd = 0;
@@ -554,62 +562,67 @@ class SakuraTree extends Tree {
 					$zd = 0;
 					break;
 			}
-			
+
 			$stickLen = round($trunkHeight / 3);
 			$stickLen2 = call_user_func($branchLen2, $stickLen);
 			$totalLength = $stickLen + $stickLen2; // Length of the stick
 			$sideLen = $totalLength ** 2; // Side length
-			                              
+
+			//TODO CHECK WHAT THIS IS SUPPOSED TO BE
+			$numForward = 0;
+			//TODO END
+			$lX1 = $lZ1 = $lX = $lZ = 0;
+
 			// First branch part + first leave part
-			for($i = 1; $i < $stickLen + 1; $i ++) {
+			for ($i = 1; $i < $stickLen + 1; $i++) {
 				$lX1 = $lastX + ($xd * $i);
 				$lZ1 = $lastZ + ($zd * $i);
 				if ($zd !== 0)
-					for($x = $lX1 - $numForward; $x !== $lX1 + $numForward + 1; $x ++) {
+					for ($x = $lX1 - $numForward; $x !== $lX1 + $numForward + 1; $x++) {
 						$this->setLeave($level, $x, $lastY + 3, $lZ1, $random);
 					}
 				if ($xd !== 0)
-					for($z = $lZ1 - $numForward; $z !== $lZ1 + $numForward + 1; $z ++) {
+					for ($z = $lZ1 - $numForward; $z !== $lZ1 + $numForward + 1; $z++) {
 						$this->setLeave($level, $lX1, $lastY + 3, $z, $random);
 					}
 				$this->setLog($level, $lX1, $lastY, $lZ1);
 			}
-			
+
 			// Second branch part. + second leave part
 			$numForward = ($totalLength % 2 == 0) ? $totalLength - 1 : $totalLength;
-			for($i = 1; $i < $stickLen + 1; $i ++) {
+			for ($i = 1; $i < $stickLen + 1; $i++) {
 				$lX = $lX1 + ($xd * $i);
 				$lZ = $lZ1 + ($zd * $i);
 				if ($zd !== 0)
-					for($x = $lX - $numForward; $x !== $lX + $numForward + 1; $x ++) {
+					for ($x = $lX - $numForward; $x !== $lX + $numForward + 1; $x++) {
 						$this->setLeave($level, $x, $lastY + 2, $lZ, $random);
 					}
 				if ($xd !== 0)
-					for($z = $lZ - $numForward; $z !== $lZ + $numForward + 1; $z ++) {
+					for ($z = $lZ - $numForward; $z !== $lZ + $numForward + 1; $z++) {
 						$this->setLeave($level, $lX, $lastY + 2, $z, $random);
 					}
 				$this->setLog($level, $lX, $lastY + 1, $lZ);
 			}
-			
+
 			$lX += $xd;
 			$lZ += $zd;
 			// Leaves falling from the tree forward
 			if ($lastZ !== $lZ) { // Z has changed, using X for setting
-				for($x = $lX - $numForward; $x <= $lX + $numForward; $x ++) {
-					$numDown = $random->nextBoundedInt(3 ) + 1;
-					for($y = $lastY + 1; $y > $lastY - $numDown; $y --)
+				for ($x = $lX - $numForward; $x <= $lX + $numForward; $x++) {
+					$numDown = $random->nextBoundedInt(3) + 1;
+					for ($y = $lastY + 1; $y > $lastY - $numDown; $y--)
 						$this->setLeave($level, $x, $y, $lZ, $random);
 				}
 			} else { // Z have stayed, X has changed
-				for($z = $lZ - $numForward; $z <= $lZ + $numForward; $z ++) {
-					$numDown = $random->nextBoundedInt(3 ) + 1;
-					for($y = $lastY + 1; $y > $lastY + 1 - $numDown; $y --)
+				for ($z = $lZ - $numForward; $z <= $lZ + $numForward; $z++) {
+					$numDown = $random->nextBoundedInt(3) + 1;
+					for ($y = $lastY + 1; $y > $lastY + 1 - $numDown; $y--)
 						$this->setLeave($level, $lX, $y, $z, $random);
 				}
 			}
-			
+
 			// continue;
-			
+
 			switch ($dir + 1) {
 				case 4 :
 					$xd2 = 0;
@@ -628,21 +641,21 @@ class SakuraTree extends Tree {
 					$zd2 = 0;
 					break;
 			}
-			
+
 			// Leaves falling from the tree diagonally
-			foreach(self::DIAG_LEAVES [$trunkHeight] as $pos ) {
-				$numDown = $random->nextBoundedInt(3 ) + 1;
-				for($y = $lastY + 1; $y > $lastY - $numDown; $y --)
+			foreach (self::DIAG_LEAVES [$trunkHeight] as $pos) {
+				$numDown = $random->nextBoundedInt(3) + 1;
+				for ($y = $lastY + 1; $y > $lastY - $numDown; $y--)
 					$this->setLeave($level, $lastX + $pos [0], $y, $lastZ + $pos [1], $random);
 			}
-			
+
 			// Additional leaves
-			foreach(self::ADDITIONAL_BLOCKS [$trunkHeight] as $pos ) {
+			foreach (self::ADDITIONAL_BLOCKS [$trunkHeight] as $pos) {
 				$this->setLeave($level, $lastX + $pos [0], $lastY + 2, $lastZ + $pos [1], $random);
 			}
 		}
 	}
-	
+
 	/*
 	 * Fills a log at.
 	 * @param $level pocketmine\level\ChunkManager
@@ -654,7 +667,7 @@ class SakuraTree extends Tree {
 		$level->setBlockIdAt($x, $y, $z, $this->trunkBlock);
 		$level->setBlockDataAt($x, $y, $z, $this->type);
 	}
-	
+
 	/*
 	 * Fills a leave at.
 	 * @param $level pocketmine\level\ChunkManager
@@ -664,10 +677,10 @@ class SakuraTree extends Tree {
 	 * @param $random pocketmine\utils\Random
 	 */
 	public function setLeave(ChunkManager $level, $x, $y, $z, Random $random) {
-		$data = [ 
-				$this->leafType,
-				$this->leaf2Type 
-		] [( int ) $random->nextBoolean ()];
+		$data = [
+			$this->leafType,
+			$this->leaf2Type
+		] [( int )$random->nextBoolean()];
 		$level->setBlockIdAt($x, $y, $z, $this->leafBlock);
 		$level->setBlockDataAt($x, $y, $z, $data);
 	}
diff --git a/src/Ad5001/BetterGen/structure/SugarCane.php b/src/Ad5001/BetterGen/structure/SugarCane.php
index 44b6f2f..cbbc670 100644
--- a/src/Ad5001/BetterGen/structure/SugarCane.php
+++ b/src/Ad5001/BetterGen/structure/SugarCane.php
@@ -16,9 +16,9 @@
 namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
-use pocketmine\utils\Random;
 use pocketmine\level\ChunkManager;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 class SugarCane extends Object {
 	
@@ -30,6 +30,8 @@ class SugarCane extends Object {
 	 * @param $z int
 	 * @param $random pocketmine\utils\Random
 	 */
+	private $totalHeight;
+
 	public function canPlaceObject(ChunkManager $level, int $x, int $y, int $z, Random $random): bool {
 		$this->totalHeight = 1 + $random->nextBoundedInt(3);
 		$below = $level->getBlockIdAt($x, $y - 1, $z);
diff --git a/src/Ad5001/BetterGen/structure/Temple.php b/src/Ad5001/BetterGen/structure/Temple.php
index a43e0cd..d379db9 100644
--- a/src/Ad5001/BetterGen/structure/Temple.php
+++ b/src/Ad5001/BetterGen/structure/Temple.php
@@ -14,13 +14,13 @@
 
 namespace Ad5001\BetterGen\structure;
 
-use pocketmine\block\Block;
-use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
-use pocketmine\math\Vector3;
-use pocketmine\level\generator\object\Object;
 use Ad5001\BetterGen\loot\LootTable;
 use Ad5001\BetterGen\utils\BuildingUtils;
+use pocketmine\block\Block;
+use pocketmine\level\ChunkManager;
+use pocketmine\level\generator\object\Object;
+use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class Temple extends Object {
 	const DIRECTION_PLUSX = 0;
@@ -109,6 +109,7 @@ class Temple extends Object {
 					1 
 			] 
 	];
+	private $direction;
 
 	/*
 	 * Checks if a temple is placeable
diff --git a/src/Ad5001/BetterGen/structure/Well.php b/src/Ad5001/BetterGen/structure/Well.php
index 4bd6ee6..dcd55b9 100644
--- a/src/Ad5001/BetterGen/structure/Well.php
+++ b/src/Ad5001/BetterGen/structure/Well.php
@@ -17,8 +17,8 @@ namespace Ad5001\BetterGen\structure;
 
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
-use pocketmine\utils\Random;
 use pocketmine\level\generator\object\Object;
+use pocketmine\utils\Random;
 
 
 class Well extends Object {
diff --git a/src/Ad5001/BetterGen/utils/BuildingUtils.php b/src/Ad5001/BetterGen/utils/BuildingUtils.php
index 8a74a34..cd9cf3e 100644
--- a/src/Ad5001/BetterGen/utils/BuildingUtils.php
+++ b/src/Ad5001/BetterGen/utils/BuildingUtils.php
@@ -14,9 +14,9 @@
 
 namespace Ad5001\BetterGen\utils;
 
-use pocketmine\math\Vector3;
 use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
+use pocketmine\math\Vector3;
 use pocketmine\utils\Random;
 
 class BuildingUtils {