diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala
index bd8a4d9d1..161da333b 100644
--- a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala
+++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.scala
@@ -37,7 +37,7 @@ object EntityParticle
     def canSpawnParticle(world: World, pos: Vector3): Boolean =
     {
         val block: Block = pos.getBlock(world)
-        if (block != null && !block.isAir(world, pos.xi, pos.yi, pos.zi))
+        if (block == null || !block.isAir(world, pos.xi, pos.yi, pos.zi))
         {
             var electromagnetCount = 0
             for (i <- 0 until 6)
diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala
index 5c3f68cc6..715802421 100644
--- a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala
+++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala
@@ -16,8 +16,7 @@ class GuiAccelerator(player: EntityPlayer, tileEntity: TileAccelerator) extends
     {
         this.fontRendererObj.drawString("Accelerator", 40, 10, 4210752)
         var status: String = ""
-        val position: Vector3 = tileEntity.asVector3
-        position.add(this.tileEntity.getDirection.getOpposite)
+        val position: Vector3 = tileEntity.asVector3 + tileEntity.getDirection.getOpposite
         if (!EntityParticle.canSpawnParticle(this.tileEntity.world, position))
         {
             status = "\u00a74Fail to emit; try rotating."
diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala
index 14303ad20..4c40c5623 100644
--- a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala
+++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala
@@ -1,11 +1,13 @@
 package resonantinduction.atomic.machine.accelerator
 
+import cpw.mods.fml.relauncher.{Side, SideOnly}
 import io.netty.buffer.ByteBuf
 import net.minecraft.block.Block
 import net.minecraft.block.material.Material
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.util.IIcon
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.api.{IElectromagnet, IRotatable}
 import resonant.lib.content.prefab.java.TileElectricInventory
@@ -16,6 +18,7 @@ import resonantinduction.atomic.AtomicContent
 import resonantinduction.atomic.items.ItemAntimatter
 import resonantinduction.core.{Reference, ResonantInduction, Settings}
 import universalelectricity.core.transform.vector.Vector3
+
 import scala.collection.JavaConversions._
 
 class TileAccelerator extends TileElectricInventory(Material.iron) with IElectromagnet with IRotatable with TPacketIDReceiver
@@ -225,7 +228,7 @@ class TileAccelerator extends TileElectricInventory(Material.iron) with IElectro
 
     override def getDescPacket: PacketTile =
     {
-        return new PacketTile(xi, yi, zi, Array(DESC_PACKET_ID, velocity, totalEnergyConsumed, antimatter, energy.getEnergy))
+        return new PacketTile(xi, yi, zi, Array[Any](DESC_PACKET_ID, velocity, totalEnergyConsumed, antimatter, energy.getEnergy))
     }
 
     /////////////////////////////////////////
@@ -303,4 +306,14 @@ class TileAccelerator extends TileElectricInventory(Material.iron) with IElectro
         else
             return 0
     }
+
+    @SideOnly(Side.CLIENT)
+    override def getIcon(side: Int, meta: Int): IIcon =
+    {
+        if(side == getDirection.getOpposite.ordinal())
+        {
+            return AtomicContent.blockElectromagnet.getIcon(side, meta)
+        }
+        return getIcon
+    }
 }
\ No newline at end of file
diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala
index df9a34ab8..96619113e 100644
--- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala
+++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala
@@ -6,11 +6,9 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.inventory.IInventory
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.network.Packet
 import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids._
-import resonant.engine.ResonantEngine
 import resonant.lib.content.prefab.java.TileElectricInventory
 import resonant.lib.network.discriminator.{PacketTile, PacketType}
 import resonant.lib.network.handle.IPacketReceiver
@@ -125,9 +123,9 @@ class TileCentrifuge extends TileElectricInventory(Material.iron) with IPacketRe
 
     }
 
-    override def getDescriptionPacket: Packet =
+    override def getDescPacket: PacketTile =
     {
-        return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(xi, yi, zi, Array(this.timer, AtomicContent.getFluidAmount(this.gasTank.getFluid))))
+        return new PacketTile(xi, yi, zi, Array[Any](this.timer, AtomicContent.getFluidAmount(this.gasTank.getFluid)))
     }
 
     /**