diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java
index 2d5e828bc..cbb86e51d 100644
--- a/src/main/java/com/hbm/items/ModItems.java
+++ b/src/main/java/com/hbm/items/ModItems.java
@@ -3076,7 +3076,7 @@ public class ModItems {
 		gas_mask_filter_combo = new ItemFilter().setUnlocalizedName("gas_mask_filter_combo").setTextureName(RefStrings.MODID + ":gas_mask_filter_combo");
 		gas_mask_filter_rag = new ItemFilter().setUnlocalizedName("gas_mask_filter_rag").setTextureName(RefStrings.MODID + ":gas_mask_filter_rag");
 		gas_mask_filter_piss = new ItemFilter().setUnlocalizedName("gas_mask_filter_piss").setTextureName(RefStrings.MODID + ":gas_mask_filter_piss");
-		jetpack_tank = new ItemSyringe().setUnlocalizedName("jetpack_tank").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":jetpack_tank");
+		jetpack_tank = new ItemSyringe().setUnlocalizedName("jetpack_tank").setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":jetpack_tank");
 		gun_kit_1 = new ItemRepairKit(10).setUnlocalizedName("gun_kit_1").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gun_kit_1");
 		gun_kit_2 = new ItemRepairKit(100).setUnlocalizedName("gun_kit_2").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gun_kit_2");
 		cbt_device = new ItemSyringe().setUnlocalizedName("cbt_device").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":cbt_device");
@@ -6229,7 +6229,7 @@ public class ModItems {
 		GameRegistry.registerItem(plastic_bag, plastic_bag.getUnlocalizedName());
 
 		GameRegistry.registerItem(casing_bag, casing_bag.getUnlocalizedName());
-		
+
 		//Keys and Locks
 		GameRegistry.registerItem(key, key.getUnlocalizedName());
 		GameRegistry.registerItem(key_red, key_red.getUnlocalizedName());
diff --git a/src/main/java/com/hbm/items/special/ItemSyringe.java b/src/main/java/com/hbm/items/special/ItemSyringe.java
index 48b6e928b..b8aad87e1 100644
--- a/src/main/java/com/hbm/items/special/ItemSyringe.java
+++ b/src/main/java/com/hbm/items/special/ItemSyringe.java
@@ -48,7 +48,7 @@ public class ItemSyringe extends Item {
 				if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) {
 					player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_empty, 1, 0), false);
 				}
-			
+
 				VersatileConfig.applyPotionSickness(player, 5);
 			}
 		}
@@ -77,7 +77,7 @@ public class ItemSyringe extends Item {
 				if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) {
 					player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_empty, 1, 0), false);
 				}
-			
+
 				VersatileConfig.applyPotionSickness(player, 50);
 			}
 		}
@@ -116,7 +116,7 @@ public class ItemSyringe extends Item {
 				if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty))) {
 					player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false);
 				}
-				
+
 				VersatileConfig.applyPotionSickness(player, 5);
 			}
 		}
@@ -135,7 +135,7 @@ public class ItemSyringe extends Item {
 				if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty))) {
 					player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false);
 				}
-				
+
 				VersatileConfig.applyPotionSickness(player, 5);
 			}
 		}
@@ -155,7 +155,7 @@ public class ItemSyringe extends Item {
 				if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty))) {
 					player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false);
 				}
-				
+
 				VersatileConfig.applyPotionSickness(player, 5);
 			}
 		}
@@ -175,7 +175,7 @@ public class ItemSyringe extends Item {
 				if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty))) {
 					player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false);
 				}
-				
+
 				VersatileConfig.applyPotionSickness(player, 15);
 			}
 		}
@@ -193,7 +193,7 @@ public class ItemSyringe extends Item {
 				player.removePotionEffect(Potion.weakness.id);
 				player.removePotionEffect(Potion.wither.id);
 				player.removePotionEffect(HbmPotion.radiation.id);
-				
+
 				VersatileConfig.applyPotionSickness(player, 15);
 
 				stack.stackSize--;
@@ -283,18 +283,17 @@ public class ItemSyringe extends Item {
 					return stack;
 
 				IFillableItem fillable = (IFillableItem) jetpack.getItem();
-				
+
 				if(!fillable.acceptsFluid(Fluids.KEROSENE, jetpack))
 					return stack;
-				
-				fillable.tryFill(Fluids.KEROSENE, 1000, jetpack);
-				
+
+				if(fillable.tryFill(Fluids.KEROSENE, 1000, jetpack) < 1000) {
+					world.playSoundAtEntity(player, "hbm:item.jetpackTank", 1.0F, 1.0F);
+					stack.stackSize--;
+				}
+
 				if(jetpack.getItem() != player.inventory.armorInventory[2].getItem())
 					ArmorModHandler.applyMod(player.inventory.armorInventory[2], jetpack);
-
-				world.playSoundAtEntity(player, "hbm:item.jetpackTank", 1.0F, 1.0F);
-
-				stack.stackSize--;
 			}
 		}
 
@@ -386,11 +385,11 @@ public class ItemSyringe extends Item {
 
 		if(this == ModItems.syringe_awesome && !VersatileConfig.hasPotionSickness(entity)) {
 			if(!world.isRemote) {
-				
+
 				if(entity instanceof EntityCow) {
-					
+
 					entity.addPotionEffect(new PotionEffect(HbmPotion.bang.id, 40, 0));
-					
+
 				} else  {
 					entity.addPotionEffect(new PotionEffect(Potion.regeneration.id, 50 * 20, 9));
 					entity.addPotionEffect(new PotionEffect(Potion.resistance.id, 50 * 20, 9));
@@ -592,7 +591,7 @@ public class ItemSyringe extends Item {
 		if(this == ModItems.gun_kit_2) {
 			list.add("Repairs all weapons in hotbar by 50%");
 		}
-		
+
 		if(this == ModItems.syringe_mkunicorn) {
 			list.add(EnumChatFormatting.RED + "?");
 		}