diff --git a/scripts/commands/waypoint.py b/scripts/commands/waypoint.py
index b646ff14..3790fafa 100644
--- a/scripts/commands/waypoint.py
+++ b/scripts/commands/waypoint.py
@@ -5,123 +5,124 @@ import sys
 
 
 def run(core, actor, target, commandString):
-    validPlanets = ["tatooine", "naboo", "corellia", "rori", "talus", "yavin4", "endor", "lok", "dantooine", "dathomir", "kachirho", "etyyy", "khowir", "mustafar"]
-    validColors = ["blue", "green", "orange", "purple", "white", "yellow"]
-    crc = CRC
-    commandArgs = commandString.split(" ")
-    actorPlayer = actor.getSlottedObject("ghost")
-    
-    #/wp PLANET X Z Y COLOR NAME
-    if commandArgs[0] in validPlanets and commandArgs[4] in validColors:
-        try:
-            float(commandArgs[1])
-            float(commandArgs[2])
-            float(commandArgs[3])
-        except ValueError:
-            return
-        planet = core.terrainService.getPlanetByName(commandArgs[0])
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', planet, float(commandArgs[1]), float(commandArgs[2]), float(commandArgs[3]))
-        waypoint.setActive(True)
-        waypoint.setColor(colorCheck(commandArgs[4]))
-        name = commandString.split(" ", 5)
-        waypoint.setName(name[5])
-        waypoint.setPlanetCRC(crc.StringtoCRC(planet.getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    
+	validPlanets = ["tatooine", "naboo", "corellia", "rori", "talus", "yavin4", "endor", "lok", "dantooine", "dathomir", "kachirho", "etyyy", "khowir", "mustafar"]
+	validColors = ["blue", "green", "orange", "purple", "white", "yellow"]
+	crc = CRC
+	commandArgs = commandString.split(" ")
+	actorPlayer = actor.getSlottedObject("ghost")
 
-    #/wp X Z Y NAME
-    if len(commandArgs) >= 4 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]) and isFloat(commandArgs[2]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[2]), float(commandArgs[1]))
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        name = commandString.split(" ", 3)
-        waypoint.setName(name[3])
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    #/wp X Z Name
-    elif len(commandArgs) >= 3 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        name = commandString.split(" ", 2)
-        waypoint.setName(name[2])
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    #/wp X Z
-    elif len(commandArgs) >= 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        waypoint.setName("Waypoint")
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    
-    #/wp planet x z y name
-    elif len(commandArgs) >= 3 and isFloat(commandArgs[2]) and isFloat(commandArgs[3]) and isFloat(commandArgs[4]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', core.terrainService.getPlanetByName(commandArgs[1]), float(commandArgs[2]), float(commandArgs[4]), float(commandArgs[3]))
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        name = commandString.split(" ", 5)
-        if name == "":
-            name = "Waypoint"
+	#/wp PLANET X Z Y COLOR NAME
+	if len(commandArgs) > 4 and commandArgs[0] in validPlanets and commandArgs[4] in validColors:
+		try:
+			float(commandArgs[1])
+			float(commandArgs[2])
+			float(commandArgs[3])
+		except ValueError:
+			return
 
-        waypoint.setName(name[5])
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    
-    #/wp
-    else:
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, actor.getWorldPosition().y)
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        if commandString == '':
-        	waypoint.setName(actor.getPlanet().name.capitalize())
-        else:
-        	waypoint.setName(commandString)
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
-        return
-    
-    return
+		planet = core.terrainService.getPlanetByName(commandArgs[0])
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', planet, float(commandArgs[1]), float(commandArgs[3]), float(commandArgs[2]))
+		waypoint.setActive(True)
+		waypoint.setColor(colorCheck(commandArgs[4]))
+		name = commandString.split(" ", 5)
+		waypoint.setName(name[5])
+		waypoint.setPlanetCRC(crc.StringtoCRC(planet.getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp X Z Y NAME
+	elif len(commandArgs) > 3 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]) and isFloat(commandArgs[2]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[2]), float(commandArgs[1]))
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		name = commandString.split(" ", 3)
+		waypoint.setName(name[3])
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp X Z Name
+	elif len(commandArgs) > 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		name = commandString.split(" ", 2)
+		waypoint.setName(name[2])
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp X Z
+	elif len(commandArgs) == 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		waypoint.setName("Waypoint")
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp planet x z y name
+	elif len(commandArgs) > 4 and commandArgs[0] in validPlanets and isFloat(commandArgs[1]) and isFloat(commandArgs[2]) and isFloat(commandArgs[3]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', core.terrainService.getPlanetByName(commandArgs[0]), float(commandArgs[1]), float(commandArgs[3]), float(commandArgs[2]))
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		name = commandString.split(" ", 4)
+		if name == "":
+			name = "Waypoint"
+
+		waypoint.setName(name[4])
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp
+	else:
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, actor.getWorldPosition().y)
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		if commandString == '':
+			waypoint.setName(actor.getPlanet().name.capitalize())
+		else:
+			waypoint.setName(commandString)
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
+		return
+	return
 
 def colorCheck(validcolors):
-    if validcolors == "blue":
-        return WaypointObject.BLUE
-    if validcolors == "green":
-        return WaypointObject.GREEN
-    if validcolors == "orange":
-        return WaypointObject.ORANGE
-    if validcolors == "purple":
-        return WaypointObject.PURPLE
-    if validcolors == "white":
-        return WaypointObject.WHITE
-    if validcolors == "yellow":
-        return WaypointObject.YELLOW
-    return
+	if validcolors == "blue":
+		return WaypointObject.BLUE
+	if validcolors == "green":
+		return WaypointObject.GREEN
+	if validcolors == "orange":
+		return WaypointObject.ORANGE
+	if validcolors == "purple":
+		return WaypointObject.PURPLE
+	if validcolors == "white":
+		return WaypointObject.WHITE
+	if validcolors == "yellow":
+		return WaypointObject.YELLOW
+	return
 
 def isFloat(string):
-    try:
-        stringFloat = float(string)
-    except ValueError:
-        return False
-    
-    else:
-        return True
-    return
\ No newline at end of file
+	try:
+		stringFloat = float(string)
+	except ValueError:
+		return False
+	
+	else:
+		return True
+	return
\ No newline at end of file
diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java
index c29a117d..03545e38 100644
--- a/src/services/EntertainmentService.java
+++ b/src/services/EntertainmentService.java
@@ -126,7 +126,6 @@ public class EntertainmentService implements INetworkDispatch {
 				if (sentPacket.getTargetId() != sentPacket.getDesignerId()) {
 					
 					if (sentPacket.isCustomerAccepted() && sentPacket.isDesignerCommited()) {
-						System.out.print("Both Accepted!");
 
 						sentPacket.setEndMessage(true);