Cleaned up code, began developent on NPC creator/ modifier