diff --git a/.gitignore b/.gitignore
index 1c5dcae9..ddb52186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,9 @@ odb/guild/je.info.*
 odb/mails/je.info.*
 odb/oids/je.info.*
 
+# PSWG Configs
+options.cfg
+
 # External tool builders
 .externalToolBuilders/
 
diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java
index 1bed00ed..fe39d10d 100644
--- a/src/services/EntertainmentService.java
+++ b/src/services/EntertainmentService.java
@@ -872,6 +872,8 @@ public class EntertainmentService implements INetworkDispatch {
 	
 	private void handleImageDesign(CreatureObject designer, CreatureObject designTarget, Vector<IDAttribute> colorAttributes, Vector<IDAttribute> bodyAttributes, String hairTemplate, String holoEmote) {
 
+		if(!hairTemplate.startsWith("object/tangible/hair/")) return;
+		
 		if (hairTemplate != null && !hairTemplate.equals("")) {
 			System.out.println(hairTemplate);
 			String sharedHairTemplate = hairTemplate.replace("/hair_", "/shared_hair_");
diff --git a/src/services/SkillService.java b/src/services/SkillService.java
index d1f14e4e..59831d10 100644
--- a/src/services/SkillService.java
+++ b/src/services/SkillService.java
@@ -290,9 +290,10 @@ public class SkillService implements INetworkDispatch {
 		try 
 		{
 			DatatableVisitor table = ClientFileManager.loadFile("datatables/player/player_level.iff", DatatableVisitor.class);		
-			for (int i = 0; i <= creature.getLevel(); i++) expertisePoints += (int) table.getObject(i, 5);	
+			for (int i = 0; i <= creature.getLevel(); i++) expertisePoints += (int) table.getObject(i, 5);
+			for (String skill : creature.getSkills()) if(skill.startsWith("expertise_")) expertisePoints--;
 		}
-		catch (Exception e) { e.printStackTrace(); }
+		catch (Exception e) { e.printStackTrace(); }	
 		return expertisePoints;
 	}