diff --git a/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 0480e25839..6c165b3ead 100644
--- a/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -100,7 +100,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 			{
 				if (qs.isCond(2))
 				{
-					qs.setCond(3, true);
+					qs.setCond(3, true); // proper?
 					giveItems(player, GROCERY_SUPPLY_BOX);
 				}
 				break;
@@ -136,14 +136,20 @@ public final class Q10739_SupplyAndDemand extends Quest
 				switch (qs.getState())
 				{
 					case State.CREATED:
+					{
 						htmltext = "33935-01.htm";
 						break;
+					}
 					case State.STARTED:
+					{
 						htmltext = "33935-04.html";
 						break;
+					}
 					case State.COMPLETED:
+					{
 						htmltext = getAlreadyCompletedMsg(player);
 						break;
+					}
 				}
 				break;
 			}
@@ -193,6 +199,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 				break;
 			}
 			case SIVANTHE:
+			{
 				if (qs.isStarted() && qs.isCond(4))
 				{
 					giveItems(player, LEATHER_SHIRT);
@@ -210,6 +217,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 					htmltext = getAlreadyCompletedMsg(player);
 				}
 				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Ertheia/dist/game/data/spawns/Fearon/FearonVillage.xml b/L2J_Mobius_Ertheia/dist/game/data/spawns/Fearon/FearonVillage.xml
index 0df7a080c2..70c729908d 100644
--- a/L2J_Mobius_Ertheia/dist/game/data/spawns/Fearon/FearonVillage.xml
+++ b/L2J_Mobius_Ertheia/dist/game/data/spawns/Fearon/FearonVillage.xml
@@ -23,7 +23,7 @@
 			<npc id="33934" x="-77647" y="248024" z="-3288" heading="33564" respawnTime="60sec" /> <!-- Denya -->
 			<npc id="33935" x="-77779" y="248545" z="-3288" heading="29396" respawnTime="60sec" /> <!-- Evna -->
 			<npc id="33936" x="-78009" y="247708" z="-3288" heading="19728" respawnTime="60sec" /> <!-- Pelu -->
-			<npc id="33937" x="-78217" y="247630" z="-3288" heading="20620" respawnTime="60sec" /> <!-- Ceri -->
+			<npc id="33937" x="-78217" y="247630" z="-3296" heading="20620" respawnTime="60sec" /> <!-- Ceri -->
 			<npc id="33938" x="-78607" y="251035" z="-2960" heading="36976" respawnTime="60sec" /> <!-- Taoren -->
 			<npc id="33939" x="-78690" y="251105" z="-2960" heading="46496" respawnTime="60sec" /> <!-- Zaoren -->
 			<npc id="33940" x="-80493" y="251680" z="-3064" heading="10442" respawnTime="60sec" /> <!-- Vinath -->
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 0480e25839..6c165b3ead 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -100,7 +100,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 			{
 				if (qs.isCond(2))
 				{
-					qs.setCond(3, true);
+					qs.setCond(3, true); // proper?
 					giveItems(player, GROCERY_SUPPLY_BOX);
 				}
 				break;
@@ -136,14 +136,20 @@ public final class Q10739_SupplyAndDemand extends Quest
 				switch (qs.getState())
 				{
 					case State.CREATED:
+					{
 						htmltext = "33935-01.htm";
 						break;
+					}
 					case State.STARTED:
+					{
 						htmltext = "33935-04.html";
 						break;
+					}
 					case State.COMPLETED:
+					{
 						htmltext = getAlreadyCompletedMsg(player);
 						break;
+					}
 				}
 				break;
 			}
@@ -193,6 +199,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 				break;
 			}
 			case SIVANTHE:
+			{
 				if (qs.isStarted() && qs.isCond(4))
 				{
 					giveItems(player, LEATHER_SHIRT);
@@ -210,6 +217,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 					htmltext = getAlreadyCompletedMsg(player);
 				}
 				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Helios/dist/game/data/spawns/Fearon/FearonVillage.xml b/L2J_Mobius_Helios/dist/game/data/spawns/Fearon/FearonVillage.xml
index 0df7a080c2..70c729908d 100644
--- a/L2J_Mobius_Helios/dist/game/data/spawns/Fearon/FearonVillage.xml
+++ b/L2J_Mobius_Helios/dist/game/data/spawns/Fearon/FearonVillage.xml
@@ -23,7 +23,7 @@
 			<npc id="33934" x="-77647" y="248024" z="-3288" heading="33564" respawnTime="60sec" /> <!-- Denya -->
 			<npc id="33935" x="-77779" y="248545" z="-3288" heading="29396" respawnTime="60sec" /> <!-- Evna -->
 			<npc id="33936" x="-78009" y="247708" z="-3288" heading="19728" respawnTime="60sec" /> <!-- Pelu -->
-			<npc id="33937" x="-78217" y="247630" z="-3288" heading="20620" respawnTime="60sec" /> <!-- Ceri -->
+			<npc id="33937" x="-78217" y="247630" z="-3296" heading="20620" respawnTime="60sec" /> <!-- Ceri -->
 			<npc id="33938" x="-78607" y="251035" z="-2960" heading="36976" respawnTime="60sec" /> <!-- Taoren -->
 			<npc id="33939" x="-78690" y="251105" z="-2960" heading="46496" respawnTime="60sec" /> <!-- Zaoren -->
 			<npc id="33940" x="-80493" y="251680" z="-3064" heading="10442" respawnTime="60sec" /> <!-- Vinath -->
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 0480e25839..6c165b3ead 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -100,7 +100,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 			{
 				if (qs.isCond(2))
 				{
-					qs.setCond(3, true);
+					qs.setCond(3, true); // proper?
 					giveItems(player, GROCERY_SUPPLY_BOX);
 				}
 				break;
@@ -136,14 +136,20 @@ public final class Q10739_SupplyAndDemand extends Quest
 				switch (qs.getState())
 				{
 					case State.CREATED:
+					{
 						htmltext = "33935-01.htm";
 						break;
+					}
 					case State.STARTED:
+					{
 						htmltext = "33935-04.html";
 						break;
+					}
 					case State.COMPLETED:
+					{
 						htmltext = getAlreadyCompletedMsg(player);
 						break;
+					}
 				}
 				break;
 			}
@@ -193,6 +199,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 				break;
 			}
 			case SIVANTHE:
+			{
 				if (qs.isStarted() && qs.isCond(4))
 				{
 					giveItems(player, LEATHER_SHIRT);
@@ -210,6 +217,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 					htmltext = getAlreadyCompletedMsg(player);
 				}
 				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Underground/dist/game/data/spawns/Fearon/FearonVillage.xml b/L2J_Mobius_Underground/dist/game/data/spawns/Fearon/FearonVillage.xml
index 0df7a080c2..70c729908d 100644
--- a/L2J_Mobius_Underground/dist/game/data/spawns/Fearon/FearonVillage.xml
+++ b/L2J_Mobius_Underground/dist/game/data/spawns/Fearon/FearonVillage.xml
@@ -23,7 +23,7 @@
 			<npc id="33934" x="-77647" y="248024" z="-3288" heading="33564" respawnTime="60sec" /> <!-- Denya -->
 			<npc id="33935" x="-77779" y="248545" z="-3288" heading="29396" respawnTime="60sec" /> <!-- Evna -->
 			<npc id="33936" x="-78009" y="247708" z="-3288" heading="19728" respawnTime="60sec" /> <!-- Pelu -->
-			<npc id="33937" x="-78217" y="247630" z="-3288" heading="20620" respawnTime="60sec" /> <!-- Ceri -->
+			<npc id="33937" x="-78217" y="247630" z="-3296" heading="20620" respawnTime="60sec" /> <!-- Ceri -->
 			<npc id="33938" x="-78607" y="251035" z="-2960" heading="36976" respawnTime="60sec" /> <!-- Taoren -->
 			<npc id="33939" x="-78690" y="251105" z="-2960" heading="46496" respawnTime="60sec" /> <!-- Zaoren -->
 			<npc id="33940" x="-80493" y="251680" z="-3064" heading="10442" respawnTime="60sec" /> <!-- Vinath -->