diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_2_1_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_2_1_ws.tab
index 5baefb0a1..6004e57a8 100755
--- a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_2_1_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_2_1_ws.tab
@@ -108,6 +108,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1094994	2775415	object/tangible/gambling/slot/standard.iff	0	-12.38944	1.000865	4.220554	0.7109056	0	-0.7032878	0		$|
 2775416	2775409	object/cell/cell.iff	7	0	0	0	1	0	0	0		$|
 2775417	2775409	object/cell/cell.iff	8	0	0	0	1	0	0	0		$|
+-3	2775417	object/tangible/npc/corellia_spawn/karrek_flim.iff	8	-6.2	1.6	-7.2	1	0	0	0		$|
 2775418	2775409	object/cell/cell.iff	9	0	0	0	1	0	0	0		$|
 2775419	2775409	object/cell/cell.iff	10	0	0	0	1	0	0	0		$|
 2775427	0	object/building/corellia/filler_historic_32x16_s01.iff	0	576.646	23.4	1975.42	1	0	0	0	theme_park.script_spawner.spawner_methods.gcw_spawner	$|
@@ -167,20 +168,25 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 3005687	0	object/static/structure/corellia/corl_imprv_arch_lg_s01.iff	0	602.568	23.4	1975.04	1	0	0	0		$|
 3005688	0	object/static/structure/corellia/corl_imprv_arch_lg_s01.iff	0	609.166	23.4	1981.72	0.707109	0	0.707104	0		$|
 3005689	0	object/static/structure/corellia/corl_imprv_arch_lg_s01.iff	0	595.932	23.4	1981.68	0.707108	0	0.707105	0		$|
-3005694	0	object/building/corellia/cantina_corellia.iff	0	931.567	4	1778.47	1	0	0	0		$|
+3005694	0	object/building/corellia/cantina_corellia.iff	0	931.567	4	1778.47	1	0	0	0	structure.municipal.cantina	$|
 3005695	3005694	object/cell/cell.iff	1	0	0	0	1	0	0	0		$|
 3005696	3005694	object/cell/cell.iff	2	0	0	0	1	0	0	0		$|
 3005697	3005694	object/cell/cell.iff	3	0	0	0	1	0	0	0		$|
+-6	3005697	object/tangible/poi/tatooine/interior_2_convo.iff	3	15.92	-0.9	-11.49	1	0	0	0	city.interior_2_convo	interiorConvoArea|4|corellia|poi.objective|4|city|poi.script|4|city.interior_2_convo|$|
 3005698	3005694	object/cell/cell.iff	4	0	0	0	1	0	0	0		$|
+-7	3005698	object/tangible/poi/tatooine/interior_2_convo.iff	4	20.13	-0.9	-18.41	1	0	0	0	city.interior_2_convo	interiorConvoArea|4|corellia|poi.objective|4|city|poi.script|4|city.interior_2_convo|$|
 3005699	3005694	object/cell/cell.iff	5	0	0	0	1	0	0	0		$|
 3005700	3005694	object/cell/cell.iff	6	0	0	0	1	0	0	0		$|
 3005701	3005694	object/cell/cell.iff	7	0	0	0	1	0	0	0		$|
 3005702	3005694	object/cell/cell.iff	8	0	0	0	1	0	0	0		$|
+-4	3005702	object/tangible/npc/corellia_spawn/venthan_chassu.iff	8	-5.2	-0.9	-21.3	1	0	0	0		$|
 3005703	3005694	object/cell/cell.iff	9	0	0	0	1	0	0	0		$|
+-8	3005703	object/tangible/poi/tatooine/interior_2_convo.iff	9	-7.43	-0.9	21.16	1	0	0	0	city.interior_2_convo	interiorConvoArea|4|corellia|poi.objective|4|city|poi.script|4|city.interior_2_convo|$|
 3005704	3005694	object/cell/cell.iff	10	0	0	0	1	0	0	0		$|
 3005705	3005694	object/cell/cell.iff	11	0	0	0	1	0	0	0		$|
 3005706	3005694	object/cell/cell.iff	12	0	0	0	1	0	0	0		$|
 3005707	3005694	object/cell/cell.iff	13	0	0	0	1	0	0	0		$|
+-5	3005707	object/tangible/npc/corellia_spawn/vinya_maysor.iff	8	-28.9	-0.5	10.9	1	0	0	0		$|
 3005708	3005694	object/cell/cell.iff	14	0	0	0	1	0	0	0		$|
 3005709	3005694	object/cell/cell.iff	15	0	0	0	1	0	0	0		$|
 3055537	0	object/building/corellia/filler_historic_32x16_s01.iff	0	1003.48	4.30735	1783.51	0.999893	-0.00202547	-3.02328E-05	0.0144617		$|
@@ -343,3 +349,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 3055592	0	object/building/corellia/filler_slum_24x16_s02.iff	0	832.796	4	1741.75	0.707107	0	0.707107	0		$|
 3055690	0	object/building/corellia/filler_slum_24x16_s01.iff	0	920.984	3.95414	1826.53	0.707108	0	-0.707106	0		$|
 -1	0	object/tangible/poi/tatooine/explore_cor_tyrena_theater.iff	0	724	24	1946	1	0	0	0		$|
+-2	0	object/tangible/npc/rebel_recruiter_spawner.iff	0	987	4	1779	0	0	1	0		$|