diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/All In One NPC Recorder and Player.prj b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/All In One NPC Recorder and Player.prj
index faeb35ae..a1cc8cc2 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/All In One NPC Recorder and Player.prj	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/All In One NPC Recorder and Player.prj	
@@ -26,6 +26,8 @@
 		</Script>
 		<Script name="Collision test.lsl" guid="9a7e990c-7f43-400f-b2a7-2e0311162d5a">
 		</Script>
+		<Script name="Listener for things that appear and disappear.lsl" guid="4ec868f0-b792-4fb1-bb0c-ef5747d20327">
+		</Script>
 		<Script name="Stop Processing.lsl" guid="1a220cc3-3120-4997-9d06-01f721ccda97">
 		</Script>
 		<Script name="Touch to Go.lsl" guid="1f188bfb-241f-410b-b29c-e81b8df22358">
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/LSLEditor fake NPC commands.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/LSLEditor fake NPC commands.lsl
index f6aed04b..ee3aa553 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/LSLEditor fake NPC commands.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/LSLEditor fake NPC commands.lsl	
@@ -12,7 +12,7 @@
 // :DESCRIPTION:
 // All in one NPC recorder player set of debug functions. Add these ONLY if you are compileing in LSLEditor.
 // :CODE:
-// IMPORTANT NOTE 
+// IMPORTANT NOTE
 // DELETE ALL these lines out for Opensim, leave uncommented for testing in LSLEditor
 
 integer OS_NPC_CREATOR_OWNED = 1;
@@ -26,110 +26,110 @@ integer OS_NPC_FLY = 7;
 
 
 integer osIsNpc(key id){
-    return TRUE;
+	return TRUE;
 }
 
 osNpcStand(key npc) {
-    llOwnerSay("Standing");
+	llOwnerSay("Standing");
 }
 vector osNpcGetPos(key id) {
-    vector vDestPos;
-    vDestPos.x += llFrand(1.0);        // some randomness for debugging
-    llOwnerSay("Reached " + (string) vDestPos);
-    return vDestPos;
+	vector vDestPos;
+	vDestPos.x += llFrand(1.0);        // some randomness for debugging
+	llOwnerSay("Reached " + (string) vDestPos);
+	return vDestPos;
 }
 osNpcMoveToTarget(key npc, vector target, integer options){
-    llSay(0,"Moving to " + (string) target);
+	llSay(0,"Moving to " + (string) target);
 }
 key osNpcCreate(string firstname, string lastname, vector position, string cloneFrom, integer options) {
-    llSay(0,"Creating NPC " + firstname + " " + lastname + " at " + (string) position);
-    return (key) "12345000-0000-0000-0000-0000000000002";
+	llSay(0,"Creating NPC " + firstname + " " + lastname + " at " + (string) position);
+	return (key) "12345000-0000-0000-0000-0000000000002";
 }
 osNpcLoadAppearance(key npc, string notecard) {
-    llSay(0,"Load notecard " + notecard);
+	llSay(0,"Load notecard " + notecard);
 }
 osNpcPlayAnimation(key npc, string animation) {
-    llSay(0,"Playing animation " + animation);
+	llSay(0,"Playing animation " + animation);
 }
 osNpcStopAnimation(key npc, string animation) {
-    llSay(0,"Stopped animation " + animation);
+	llSay(0,"Stopped animation " + animation);
 }
 osNpcSay(key npc, integer iChannel, string message) {
-    llSay(0,"Saying " + message);
+	llSay(0,"Saying " + message);
 }
 osNpcWhisper(key npc, integer iChannel, string message) {
-    llSay(0,"Whispering " + message);
+	llSay(0,"Whispering " + message);
 }
 osNpcShout(key npc, integer iChannel, string message) {
-    llSay(0,"Shouting " + message);
+	llSay(0,"Shouting " + message);
 }
 osNpcSit(key npc, key target, integer options) {
-    llSay(0,"Sat on " +target);
+	llSay(0,"Sat on " +target);
 }
 osNpcSetRot(key npc, rotation rot) {
-    llSay(0,"Set rotation of NPC to " + (string) rot);
+	llSay(0,"Set rotation of NPC to " + (string) rot);
 }
 osOwnerSaveAppearance(string notecard) {
-    llSay(0,"Created Notecard " + notecard);
+	llSay(0,"Created Notecard " + notecard);
 }
 osAgentSaveAppearance(key avatar, string notecard) {
-    llSay(0,"Created Notecard " + notecard);
+	llSay(0,"Created Notecard " + notecard);
 }
 osNpcRemove (key  target) {
-    llSay(0,"NPC removed");
+	llSay(0,"NPC removed");
 }
 list osGetAvatarList () {
-    list lStuff = [(key) "12345000-0000-0000-0000-0000000000002", <1,2,3>, "Digit Gorilla"];
-    return lStuff;
+	list lStuff = [(key) "12345000-0000-0000-0000-0000000000002", <1,2,3>, "Digit Gorilla"];
+	return lStuff;
 }
 osMakeNotecard(string notecardName, string contents) {
-    llOwnerSay("Make Notecard " + notecardName + "Contents:" +  (string) contents);
+	llOwnerSay("Make Notecard " + notecardName + "Contents:" +  (string) contents);
 }
 string osGetNotecard(string name) {
-    // sample notecard for testing
-    string str = "@spawn=Digit Gorilla|<645, 128, 25>\n"
-        + "@walk=<645, 120, 25>\n"
-        + "REPEAT\n"
-        + "@cmd=0|Hello on channel 0\n"
-        + "@wander=3|5\n"
-        + "@say=say , walking is so tiresome...\n"
-        + "@whisper=whisper, walking is so tiresome...\n"
-        + "@shout=shout, walking is so tiresome...\n"
-        + "@goto=REPEAT\n"
-        + "@goto=NEXT\n"
-        + "@say=i will never say this...\n"
-        + "NEXT\n"
-        + "@sound=somesound\n"
-        + "@randsound\n"
-        + "@pause=5\n"
-        + "@rotate=90\n"
-        + "@wander=3|1\n"
-        + "@say=Uff, I'm done...\n"
-        + "@delete\n";
-    return str;
+	// sample notecard for testing
+	string str = "@spawn=Digit Gorilla|<645, 128, 25>\n"
+		+ "@walk=<645, 120, 25>\n"
+		+ "REPEAT\n"
+		+ "@cmd=0|Hello on channel 0\n"
+		+ "@wander=3|5\n"
+		+ "@say=say , walking is so tiresome...\n"
+		+ "@whisper=whisper, walking is so tiresome...\n"
+		+ "@shout=shout, walking is so tiresome...\n"
+		+ "@goto=REPEAT\n"
+		+ "@goto=NEXT\n"
+		+ "@say=i will never say this...\n"
+		+ "NEXT\n"
+		+ "@sound=somesound\n"
+		+ "@randsound\n"
+		+ "@pause=5\n"
+		+ "@rotate=90\n"
+		+ "@wander=3|1\n"
+		+ "@say=Uff, I'm done...\n"
+		+ "@delete\n";
+	return str;
 }
 
 osAvatarPlayAnimation(key npc, string animation){
-    llSay(0,"playing  " + animation);
+	llSay(0,"playing  " + animation);
 }
 
 osAvatarStopAnimation(key npc, string animation){
-    llSay(0,"Stopping " + animation);
+	llSay(0,"Stopping " + animation);
 }
 
 osForceOtherSit(key AvatarKey, key UUID) {
-    llSay(0,"Sitting");
+	llSay(0,"Sitting");
 }
 
 
 osSetSpeed(key NPC, float speed) {
-    llSay(0,"Speed set to " + (string) speed);
+	llSay(0,"Speed set to " + (string) speed);
 }
 
 osNpcTouch(key NPC, key thing, integer where) {;}
 
 osForceAttachToOtherAvatarFromInventory(key npc, string inventory, integer point) {
-    llSay(0,"attach " + inventory  + " to " + (string) point);
+	llSay(0,"attach " + inventory  + " to " + (string) point);
 }
 
 osTeleportAgent( key avi, string name, vector dest, vector lookat) {;}
@@ -137,4 +137,4 @@ osTeleportAgent( key avi, string name, vector dest, vector lookat) {;}
 // END commented code for OpenSim vs Editor environments
 //*******************************************************************//
 // comment this out, is only here for testing in LSLEditor.
- default {}
+default {}
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V 4.7.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V 4.7.lsl
index 78826aef..efe4ced5 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V 4.7.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V 4.7.lsl	
@@ -44,7 +44,7 @@
 // Rev 3.4 animation timer cannot be zero or it shuts off timer tweaked
 //         solves the NPC starting up when no sensor is set.
 // Rev 3.5 fixes saving to !Path  notecard
-// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted 
+// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted
 // Rev 3.7 08-11-2015 @attach command added to load an attachment from the inventory to the NPC
 // Rev 3.8 08-17-2015 process queued commands one at a time without calling ProcessNPCLine on link message
 // Rev 3.9 08-23-2011 Queued command fixes including @delete which were not always working
@@ -80,11 +80,11 @@
 // Merged with new Route recorder and notecard writer
 // If the NPC failed to reach a destination it never moved on.
 // Added WAIT global to tune this
-// Exposed many tunable variables and ported the code 
+// Exposed many tunable variables and ported the code
 // Added floating point to times in notecard.
 // Added @sound, @randsound, @whisper, @shout, and @cmd controls.
 // notecards integers are not floats for better control
-// 
+//
 // Link Messages may be used to perform external control by injecting @commands into the stream of actions
 // Example:
 // To chat something, such as with a chat robot
@@ -102,7 +102,7 @@
 //    Enabled = true
 //
 // and then the server has to be restarted.
-// please note that there are better ways to enable NPC in the latest Opensim.  
+// please note that there are better ways to enable NPC in the latest Opensim.
 
 // Commands: All commands begin with an @ sign.  All other lines are ignored
 // @commands may have optional parameters.  The syntax is always:
@@ -137,7 +137,7 @@
 //@attach     InventoryName               attachmentPoint         load an attachment from the inventory to the NPC onto point
 //@teleport   destination (vector)        NaN                     Makes the NPC teleport to destination in the same sim.  They cannot tp to another sim or across the HG
 //@reset      NaN                         NaN                     Deletes the NPC, starts the !Path notecard over.
- 
+
 // Constant            attachmentPoint Comment
 // ATTACH_CHEST            1    chest/sternum
 // ATTACH_HEAD             2    head
@@ -181,16 +181,16 @@
 // ATTACH_AVATAR_CENTER  40    avatar center/root
 
 
-  
+
 //////////////////////////////////////////////////////////
 //                  DEBUG                               //
 //////////////////////////////////////////////////////////
 integer debug = FALSE;
-         // set to TRUE or FALSE for debug chat on various actions
+// set to TRUE or FALSE for debug chat on various actions
 integer LSLEditor = FALSE;        // set to to TRUE to working in  LSLEditor, FALSE for in-world.
-                              // you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
+// you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
 integer iTitleText = FALSE;    // set to TRUE to see debug info in text above the controller
- 
+
 //////////////////////////////////////////////////////////
 //                  TUNABLE CONFIGURATION               //
 //////////////////////////////////////////////////////////
@@ -213,9 +213,9 @@ string    WALK = "Walk";       // the name of the default Walk animation
 string    FLY = "Fly";        // the name of the default Fly animation
 string    RUN = "Run";        // the name of the default Run animation
 string    LAND = "Land";      // the name of the default land animation ( for birds only)
-float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.  
+float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.
 float    SPEEDMULT =0.8;     // 1.0 = regular avatar speed. Smaller numbers slow down walks. Large numbers speed them up.
-integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing" 
+integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing"
 
 // DESCRIPTIONS FIELDS HAVE TO SURVIVE A RESET
 //  These vars are stored  by saving them with KeyValueSet
@@ -269,7 +269,7 @@ list lMenu3 = ["<<<","@notecard","@appearance", "@touch", "@speed",       "@atta
 string sCommand;  // place to store a command for two-prompted ones
 string sParam2;   // place to store a prompt for two-prompted ones
 string priPub = "Owner Only";    // Private or Group
-key kUserKey;        // the person who is controlling the avatar, not the Owner  
+key kUserKey;        // the person who is controlling the avatar, not the Owner
 // the command lists
 list lCommands;  // commands are stored here
 list lNpcCommandList; // Storage for the NPC script.
@@ -316,705 +316,705 @@ list Stack ;              // a command stack from link message input
 
 TimerEvent(float timesent)
 {
-    if (LSLEditor)
-        timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
-        
-    DEBUG("Setting  timer: " + (string) timesent);
-    llSetTimerEvent(timesent);
+	if (LSLEditor)
+		timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
+
+	DEBUG("Setting  timer: " + (string) timesent);
+	llSetTimerEvent(timesent);
 }
 
 // for 4.1 parse a message from a Listen or a Link message
 ParseMsg(string str) {
-    DEBUG("Command In:" + str);
-    if (str=="@go") {
-        SetStop(FALSE); // Let's run the notecard
-        DEBUG("@go running");
-        DoProcessNPCLine();
-    } else {
-        Stack += [str];    // take anything, the controller will filter away non @ stuff
-        if (STATE == NULL)
-            DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
-    }
+	DEBUG("Command In:" + str);
+	if (str=="@go") {
+		SetStop(FALSE); // Let's run the notecard
+		DEBUG("@go running");
+		DoProcessNPCLine();
+	} else {
+			Stack += [str];    // take anything, the controller will filter away non @ stuff
+		if (STATE == NULL)
+			DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
+	}
 }
 
 SetStop(integer what)
 {
-    DEBUG("Stopped set to " + (string ) what);
-    Stopped = what;
+	DEBUG("Stopped set to " + (string ) what);
+	Stopped = what;
 }
 // Do* functions are much like states from the old V2 scripts.
-    
+
 // Save a Path notecard
 DoSave()
-{ 
-    STATE = MakeNotecard;
-    makeText("Stand where you want the NPC to appear, and enter the NPC Name");
+{
+	STATE = MakeNotecard;
+	makeText("Stand where you want the NPC to appear, and enter the NPC Name");
 }
 
 // This function is used to record the path for the NPC
 // Each command can take 0, 1, or 2 params
 DoMenuForCommands() {
-    makeMenu(lAtButtons);
+	makeMenu(lAtButtons);
 }
 
 
 // No one is here when sensors were on, so we kill off the NPC
 DoNobodyHome()
 {
-    DEBUG("Nobody Home");
-    STATE = NobodyHome;
-    if (NPCKey() != NULL_KEY) {
-        osNpcRemove(NPCKey());
-        SaveKey(NULL_KEY);
-    }
-    TimerEvent(5);  // keep ticking to sense avatars   
+	DEBUG("Nobody Home");
+	STATE = NobodyHome;
+	if (NPCKey() != NULL_KEY) {
+		osNpcRemove(NPCKey());
+		SaveKey(NULL_KEY);
+	}
+	TimerEvent(5);  // keep ticking to sense avatars
 }
 
 
 ///////////////////////  STATELIKE BEHAVIOUR  /////////////
-// these StateXX functions need to wait on a timer to fire. 
+// these StateXX functions need to wait on a timer to fire.
 
 // Create a NPC
 StateSpawn() {
-    DEBUG("state spawn " + sNPCName);
-     
-    NPCEnabled = TRUE; //  in world
-    // see if there is already one out there.
-    if (NPCKey() != NULL_KEY) {
-        DEBUG("Already living");
-        return;
-    }
-    
-    STATE = Spawning;        
-    list name = llParseString2List(sNPCName, [" "], []);
-   
-    vector vRezPos = vInitialPos;
-    if (relAbs == "Relative"){
-        vRezPos += llGetPos();
-    }
+	DEBUG("state spawn " + sNPCName);
 
-   // llSay(0,llDumpList2String(name,",")); 
+	NPCEnabled = TRUE; //  in world
+	// see if there is already one out there.
+	if (NPCKey() != NULL_KEY) {
+		DEBUG("Already living");
+		return;
+	}
 
-    DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
-    key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+	STATE = Spawning;
+	list name = llParseString2List(sNPCName, [" "], []);
 
-    llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
-    SaveKey(aKey); // save in description and global, too
-    
-    osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
-    TimerEvent(REZTIME);
-    NPCAnimate(STAND);
+	vector vRezPos = vInitialPos;
+	if (relAbs == "Relative"){
+		vRezPos += llGetPos();
+	}
+
+	// llSay(0,llDumpList2String(name,","));
+
+	DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
+	key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+
+	llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
+	SaveKey(aKey); // save in description and global, too
+
+	osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
+	TimerEvent(REZTIME);
+	NPCAnimate(STAND);
 }
 
 StateSit() {
-    DEBUG ("state sit - looking for " + RAMsit);
-    STATE=Sit;
-    llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state sit - looking for " + RAMsit);
+	STATE=Sit;
+	llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
 
 StateTouch() {
-    DEBUG ("state touch - looking for " + RAMtouch);
-    STATE = Touch;
-    llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state touch - looking for " + RAMtouch);
+	STATE = Touch;
+	llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
- 
+
 DoStand() {
-    DEBUG("state stand");
-    osNpcStand(NPCKey());
+	DEBUG("state stand");
+	osNpcStand(NPCKey());
 }
 
 
 StateAnimate() {
-    
-    DEBUG("state animate");
-    STATE = Animate;
-    NPCAnimate(RAManimationName);
-    if (RAManimationTime <=0 )    // V 3.4 tweak
-        RAManimationTime = 1;
-    TimerEvent(RAManimationTime);
+
+	DEBUG("state animate");
+	STATE = Animate;
+	NPCAnimate(RAManimationName);
+	if (RAManimationTime <=0 )    // V 3.4 tweak
+		RAManimationTime = 1;
+	TimerEvent(RAManimationTime);
 }
-    
+
 StateWalk() {
 
-    DEBUG("Start Walk");
-    //DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
-    STATE = Walking;
-            
-    // walk, fly, run, land
-   if (walkstate == 1) {
-        NPCAnimate(WALK);
-    } else if (walkstate == 2)  {
-        llShout(FLIGHT,"flying");
-        NPCAnimate(FLY);
-    } else if (walkstate == 3) {
-        NPCAnimate(RUN);
-    } else if (walkstate == 4) {
-        NPCAnimate(LAND);
-    } 
-    newDest = vDestPos ;
-    newDest.z += OffsetZ;
-        
-    // notecard is stored as offsets from this box with relative addressing.  Convert to absolute
-    if (relAbs == "Relative"){
-        newDest += llGetPos();
-    }
+	DEBUG("Start Walk");
+	//DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
+	STATE = Walking;
 
-    DEBUG("Moveto:" + (string) newDest);
-    osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);
+	// walk, fly, run, land
+	if (walkstate == 1) {
+		NPCAnimate(WALK);
+	} else if (walkstate == 2)  {
+			llShout(FLIGHT,"flying");
+		NPCAnimate(FLY);
+	} else if (walkstate == 3) {
+			NPCAnimate(RUN);
+	} else if (walkstate == 4) {
+			NPCAnimate(LAND);
+	}
+	newDest = vDestPos ;
+	newDest.z += OffsetZ;
+
+	// notecard is stored as offsets from this box with relative addressing.  Convert to absolute
+	if (relAbs == "Relative"){
+		newDest += llGetPos();
+	}
+
+	DEBUG("Moveto:" + (string) newDest);
+	osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 
 StateWander(){
-    DEBUG("state wander");
-    STATE = Wander;
-    
-    vector point = CirclePoint(RAMwd);
-    DEBUG("CirclePoint:" + (string) point);
-    vWanderPos = vDestPos + point;
-    DEBUG("vWanderPos:" + (string) vWanderPos);
+	DEBUG("state wander");
+	STATE = Wander;
 
-    fTimerVal = WANDERTIME;    // default time to pause after each wander
-    if (WANDERRAND)
-        fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
+	vector point = CirclePoint(RAMwd);
+	DEBUG("CirclePoint:" + (string) point);
+	vWanderPos = vDestPos + point;
+	DEBUG("vWanderPos:" + (string) vWanderPos);
 
-    NPCAnimate(WALK);
+	fTimerVal = WANDERTIME;    // default time to pause after each wander
+	if (WANDERRAND)
+		fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
 
-    DEBUG("Wander to:" + (string) vWanderPos);
+	NPCAnimate(WALK);
 
-    osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);      
+	DEBUG("Wander to:" + (string) vWanderPos);
+
+	osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 StateWanderhold() {
 
-    DEBUG("Wander Hold");
-    STATE = WanderHold;
-       
-     // now that we have reached a wander spot, slow the timer down to the desired value
-    TimerEvent(fTimerVal);
+	DEBUG("Wander Hold");
+	STATE = WanderHold;
+
+	// now that we have reached a wander spot, slow the timer down to the desired value
+	TimerEvent(fTimerVal);
 }
 
 
- 
+
 DoRotate() {
-    DEBUG("@rotate=" + (string) RAMrot); 
-    osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
-}  
+	DEBUG("@rotate=" + (string) RAMrot);
+	osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
+}
 
 
 
 // @pause=10 will do nothing for 10 seconds
 DoPause() {
-    STATE = Paused;
-    if (RAMPause < 0.1)
-        RAMPause = 0.1;
-    DEBUG("@pause=" + (string)RAMPause);
-    TimerEvent(RAMPause);
+	STATE = Paused;
+	if (RAMPause < 0.1)
+		RAMPause = 0.1;
+	DEBUG("@pause=" + (string)RAMPause);
+	TimerEvent(RAMPause);
 }
 
 
 // @stop makes the NPC stop moving in whatever state it is in.  You have to linkmessage to get moving again
-DoStop() {    
-    DEBUG("NPC is Stopped");
-    STATE   = 0;    // accept commands
-    SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-    TimerEvent(0);
-    Stack = []; // v3.8
+DoStop() {
+	DEBUG("NPC is Stopped");
+	STATE   = 0;    // accept commands
+	SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+	TimerEvent(0);
+	Stack = []; // v3.8
 }
-    
+
 // @delete removes the NPC forever. Next command starts it up again at the beginning
 DoDelete() {
-    DEBUG("state delete");
-    osNpcRemove(NPCKey());
-    SaveKey(NULL_KEY);
-    TimerEvent(0);
-    Stack = []; // v3.8
-    STATE = NULL;    // accept commands
+	DEBUG("state delete");
+	osNpcRemove(NPCKey());
+	SaveKey(NULL_KEY);
+	TimerEvent(0);
+	Stack = []; // v3.8
+	STATE = NULL;    // accept commands
 }
 
 // change the appearance of the NPC
 DoAppearance(string notecard) {
-    DEBUG("state appearance");
-    if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
-        DEBUG("Load appearance " + notecard);
-        osNpcLoadAppearance(NPCKey(),notecard);
-    }
-    STATE = NULL;    // accept commands
+	DEBUG("state appearance");
+	if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
+		DEBUG("Load appearance " + notecard);
+		osNpcLoadAppearance(NPCKey(),notecard);
+	}
+	STATE = NULL;    // accept commands
 }
 
 // Change the avatar speed
 DoSpeed(string speed) {
-    float newspeed = (float) speed;
-    if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
-        osSetSpeed(NPCKey(),newspeed);
-    }
-    STATE = NULL;    // accept commands
+	float newspeed = (float) speed;
+	if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
+		osSetSpeed(NPCKey(),newspeed);
+	}
+	STATE = NULL;    // accept commands
 }
 
 DoTeleport(string params) {
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    vector Dest = (vector) itemName;
-    if (Dest != ZERO_VECTOR) {
-        if (relAbs == "Relative"){
-            Dest += llGetPos();
-        }
-        osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
-        
-    } else {
-        llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
-    }
-    STATE = NULL;    // accept commands
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	vector Dest = (vector) itemName;
+	if (Dest != ZERO_VECTOR) {
+		if (relAbs == "Relative"){
+			Dest += llGetPos();
+		}
+		osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
+
+	} else {
+			llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
+	}
+	STATE = NULL;    // accept commands
 }
 
 
 
 DoNewNote (string card) {
-    DEBUG("Load Notecard " + card);    
-    NPCReadNoteCard(card);
-    SetStop(FALSE);
-    STATE = NULL;    // accept commands
+	DEBUG("Load Notecard " + card);
+	NPCReadNoteCard(card);
+	SetStop(FALSE);
+	STATE = NULL;    // accept commands
 }
 DoAttach(string params) {
-    
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    integer attachmentPoint  = (integer) llList2String(Data, 1);
-    if (attachmentPoint > 0
-        && attachmentPoint < 40
-        && llGetInventoryType(itemName) == INVENTORY_OBJECT
-       )
-    {
-        osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
-    }
-    STATE = NULL;    // accept commands
+
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	integer attachmentPoint  = (integer) llList2String(Data, 1);
+	if (attachmentPoint > 0
+		&& attachmentPoint < 40
+			&& llGetInventoryType(itemName) == INVENTORY_OBJECT
+				)
+				{
+					osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
+				}
+	STATE = NULL;    // accept commands
 }
 
 // This loops over the notecard, processing each command
 DoProcessNPCLine() {
-    DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
-    
-    STATE = DoProcess;
-    
-        // auto load a notecard
-    if (! llGetListLength(lNpcCommandList)) {
-        DEBUG("Read Notecard");
-        NPCReadNoteCard(Notecard);
-    }
+	DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
 
-    // look for link messages on the stack
-    string next = llList2String(Stack,0);    // lets see if there is anything from a link message
-    if (llStringLength(next))
-    {
-        Stack = llDeleteSubList(Stack,0,0);
-        ProcessCmd(next);        //lets do this command instead.
-        return;
-    }
+	STATE = DoProcess;
 
-    // @stop issued?
-    if (Stopped) {
-        TimerEvent(0);
-        DEBUG("Stopped, waiting for input");
-        STATE = NULL;
-        return;
-    }
+	// auto load a notecard
+	if (! llGetListLength(lNpcCommandList)) {
+		DEBUG("Read Notecard");
+		NPCReadNoteCard(Notecard);
+	}
 
-    // No, we have an @go for liftoff
-    next = llList2String(lNpcCommandList, 0);        // get the next command
-    DEBUG("Execute:" + next);
-    lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
-        
-    if (llGetListLength(lNpcCommandList) == 0) {
-        DEBUG("EOF");
-    }
-    ProcessCmd(next);
-} 
+	// look for link messages on the stack
+	string next = llList2String(Stack,0);    // lets see if there is anything from a link message
+	if (llStringLength(next))
+	{
+		Stack = llDeleteSubList(Stack,0,0);
+		ProcessCmd(next);        //lets do this command instead.
+		return;
+	}
+
+	// @stop issued?
+	if (Stopped) {
+		TimerEvent(0);
+		DEBUG("Stopped, waiting for input");
+		STATE = NULL;
+		return;
+	}
+
+	// No, we have an @go for liftoff
+	next = llList2String(lNpcCommandList, 0);        // get the next command
+	DEBUG("Execute:" + next);
+	lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
+
+	if (llGetListLength(lNpcCommandList) == 0) {
+		DEBUG("EOF");
+	}
+	ProcessCmd(next);
+}
 
 
 
 ProcessCmd(string cmd) {
 
-    DEBUG("ProcessCmd:" + cmd);
+	DEBUG("ProcessCmd:" + cmd);
 
-    llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
-    if (llGetSubString(cmd, 0, 0) != "@") {
-        DEBUG("ignoring");
-        TimerEvent(QUICK);  // this is so we do not recurse the stack
-        STATE = NULL;
-        return;
-    }
+	llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
+	if (llGetSubString(cmd, 0, 0) != "@") {
+		DEBUG("ignoring");
+		TimerEvent(QUICK);  // this is so we do not recurse the stack
+		STATE = NULL;
+		return;
+	}
 
-    list data  = llParseString2List(cmd, ["="], []);
-    npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
+	list data  = llParseString2List(cmd, ["="], []);
+	npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
 
-    DEBUG("Action:" + npcAction);
-    npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
-    DEBUG("Params:" + npcParams);
-    
-    @commands;
+	DEBUG("Action:" + npcAction);
+	npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
+	DEBUG("Params:" + npcParams);
 
-    ProcessSensor();
-     if (! avatarPresent){
-        DoNobodyHome();
-        DEBUG("No avatar nearby");
-        STATE = NULL;
-        return;
-    }
-    
-    if(npcAction == "@spawn") {
-        DEBUG("@spawn npcParams ");
-        list spawnData = llParseString2List(npcParams, ["|"], []);
-        sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+	@commands;
 
-        vInitialPos = (vector) llList2String(spawnData, 1);        
-        DEBUG("Coords for NPC at " + (string) vInitialPos);
-        StateSpawn();
-        return;
-    }
-    
-    
-    if(npcAction == "@stop") {
-        DoStop();
-        STATE = NULL;
-        return;
-    }
-    else if(npcAction == "@goto") {
-        DEBUG("goto");
-        integer lastIdx = llGetListLength(lNpcCommandList)-1;
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
-        // Wind commands till goto label.
-        @wind;
-        string next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        if(next1 != npcParams) jump wind;
-        // Wind the label too.
-        next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        // Get next command.
-        list data1  = llParseString2List(next1, ["="], []);
-        npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
-        npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
-        // Reschedule.
-        jump commands;
-    }
-    else if(npcAction == "@sound") {
-        DEBUG("sound");
-        llTriggerSound(npcParams,1.0);
-    }
-    else if(npcAction == "@randsound") {
-        DEBUG("@randsound");
-        integer N = llGetInventoryNumber(INVENTORY_SOUND);
-        integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
-        string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
-        llTriggerSound(toPlay,1.0);
-    }
-    else if(npcAction == "@walk") {
-        DEBUG("@walk");
-        GetDest(npcParams);
-        walkstate = 1;//  walking
-        NPCWalkOption = OS_NPC_NO_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@fly") {
-        GetDest(npcParams);
-        walkstate = 2;//  flying
-        NPCWalkOption = OS_NPC_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@run") {
-        DEBUG("@run");
-        GetDest(npcParams);
-        walkstate = 3;//  running
-        NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@land") {
-        DEBUG("@land");
-        GetDest(npcParams);
-        walkstate = 4;//  landing
-        NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@say") {
-        DEBUG("@say " + npcParams);
-        osNpcSay(NPCKey(), 0, npcParams);
-    }
-    else if(npcAction == "@shout") {
-        DEBUG("@shout");
-        osNpcShout(NPCKey(),0, npcParams);
-    }
-    else if(npcAction == "@whisper") {
-        DEBUG("@whisper " + npcParams);
-        osNpcWhisper(NPCKey(),0, npcParams);
-    }
-    // speak a command on a channel, so you can open doors and control stuff.
-    else if(npcAction == "@cmd") {
-        DEBUG("@cmd");
-        list dataToSpeak = llParseString2List(npcParams, ["|"], []);
-        string channel = llList2String(dataToSpeak,0);
-        DEBUG("Channel:"+(string) channel);
-        integer iChannel = (integer) channel;
-        string stringToSpeak = llList2String(dataToSpeak,1);
-        llSay(iChannel, stringToSpeak);
-    }
-    // stop everything
-    else if(npcAction == "@pause") {
-        RAMPause = (float) npcParams;
-        DoPause();
-        return;
-    }
-    else if(npcAction == "@wander") {
-        list wanderData = llParseString2List(npcParams, ["|"], []);
-        RAMwd = (float) llList2String(wanderData, 0);
-        RAMwc = (integer) llList2String(wanderData, 1);
-        vDestPos = osNpcGetPos(NPCKey());        // set the wander start
-        DEBUG("Starting at " + (string) vDestPos);
-        StateWander();
-        return;
-    }
-    else if(npcAction == "@rotate") {
-        RAMrot = (float) npcParams;
-        DoRotate();
-    }
-    else if(npcAction == "@sit") {
-        RAMsit= npcParams;
-        StateSit();
-        return;
-    }
-    else if(npcAction == "@touch") {
-        RAMtouch= npcParams;
-        StateTouch();
-        return;
-    }
-    else  if(npcAction == "@stand") {
-        DoStand();
-    }
-    else if(npcAction == "@delete") {
-        DoDelete();
-        SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-        return;
-    }
-    else if(npcAction == "@animate") {
-        list animateData = llParseString2List(npcParams, ["|"], []);
-        RAManimationName = llList2String(animateData, 0);
-        RAManimationTime = (float) llList2String(animateData, 1);
-        StateAnimate();
-        return;
-    }
-    else if(npcAction == "@appearance" ){
-        DoAppearance(npcParams);
-    }
-    else if (npcAction =="@speed") {
-        DoSpeed(npcParams);
-    }
-    else if (npcAction =="@notecard") {      
-        DoNewNote(npcParams);
-        Notecard = npcParams;
-    }
-    else if (npcAction == "@attach")
-    {
-        DoAttach(npcParams);
-    }
-    else if (npcAction == "@teleport")
-    {
-        DoTeleport(npcParams);
-    }
-    else if (npcAction == "@reset")
-    {
-        DoDelete();
-        SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
-    }
+	ProcessSensor();
+	if (! avatarPresent){
+		DoNobodyHome();
+		DEBUG("No avatar nearby");
+		STATE = NULL;
+		return;
+	}
 
-    STATE = NULL;
-    TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack 
+	if(npcAction == "@spawn") {
+		DEBUG("@spawn npcParams ");
+		list spawnData = llParseString2List(npcParams, ["|"], []);
+		sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+
+		vInitialPos = (vector) llList2String(spawnData, 1);
+		DEBUG("Coords for NPC at " + (string) vInitialPos);
+		StateSpawn();
+		return;
+	}
+
+
+	if(npcAction == "@stop") {
+		DoStop();
+		STATE = NULL;
+		return;
+	}
+	else if(npcAction == "@goto") {
+		DEBUG("goto");
+		integer lastIdx = llGetListLength(lNpcCommandList)-1;
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
+		// Wind commands till goto label.
+		@wind;
+		string next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		if(next1 != npcParams) jump wind;
+		// Wind the label too.
+		next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		// Get next command.
+		list data1  = llParseString2List(next1, ["="], []);
+		npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
+		npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
+		// Reschedule.
+		jump commands;
+	}
+	else if(npcAction == "@sound") {
+		DEBUG("sound");
+		llTriggerSound(npcParams,1.0);
+	}
+	else if(npcAction == "@randsound") {
+		DEBUG("@randsound");
+		integer N = llGetInventoryNumber(INVENTORY_SOUND);
+		integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
+		string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
+		llTriggerSound(toPlay,1.0);
+	}
+	else if(npcAction == "@walk") {
+		DEBUG("@walk");
+		GetDest(npcParams);
+		walkstate = 1;//  walking
+		NPCWalkOption = OS_NPC_NO_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@fly") {
+		GetDest(npcParams);
+		walkstate = 2;//  flying
+		NPCWalkOption = OS_NPC_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@run") {
+		DEBUG("@run");
+		GetDest(npcParams);
+		walkstate = 3;//  running
+		NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@land") {
+		DEBUG("@land");
+		GetDest(npcParams);
+		walkstate = 4;//  landing
+		NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@say") {
+		DEBUG("@say " + npcParams);
+		osNpcSay(NPCKey(), 0, npcParams);
+	}
+	else if(npcAction == "@shout") {
+		DEBUG("@shout");
+		osNpcShout(NPCKey(),0, npcParams);
+	}
+	else if(npcAction == "@whisper") {
+		DEBUG("@whisper " + npcParams);
+		osNpcWhisper(NPCKey(),0, npcParams);
+	}
+	// speak a command on a channel, so you can open doors and control stuff.
+	else if(npcAction == "@cmd") {
+		DEBUG("@cmd");
+		list dataToSpeak = llParseString2List(npcParams, ["|"], []);
+		string channel = llList2String(dataToSpeak,0);
+		DEBUG("Channel:"+(string) channel);
+		integer iChannel = (integer) channel;
+		string stringToSpeak = llList2String(dataToSpeak,1);
+		llSay(iChannel, stringToSpeak);
+	}
+	// stop everything
+	else if(npcAction == "@pause") {
+		RAMPause = (float) npcParams;
+		DoPause();
+		return;
+	}
+	else if(npcAction == "@wander") {
+		list wanderData = llParseString2List(npcParams, ["|"], []);
+		RAMwd = (float) llList2String(wanderData, 0);
+		RAMwc = (integer) llList2String(wanderData, 1);
+		vDestPos = osNpcGetPos(NPCKey());        // set the wander start
+		DEBUG("Starting at " + (string) vDestPos);
+		StateWander();
+		return;
+	}
+	else if(npcAction == "@rotate") {
+		RAMrot = (float) npcParams;
+		DoRotate();
+	}
+	else if(npcAction == "@sit") {
+		RAMsit= npcParams;
+		StateSit();
+		return;
+	}
+	else if(npcAction == "@touch") {
+		RAMtouch= npcParams;
+		StateTouch();
+		return;
+	}
+	else  if(npcAction == "@stand") {
+		DoStand();
+	}
+	else if(npcAction == "@delete") {
+		DoDelete();
+		SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+		return;
+	}
+	else if(npcAction == "@animate") {
+		list animateData = llParseString2List(npcParams, ["|"], []);
+		RAManimationName = llList2String(animateData, 0);
+		RAManimationTime = (float) llList2String(animateData, 1);
+		StateAnimate();
+		return;
+	}
+	else if(npcAction == "@appearance" ){
+		DoAppearance(npcParams);
+	}
+	else if (npcAction =="@speed") {
+		DoSpeed(npcParams);
+	}
+	else if (npcAction =="@notecard") {
+		DoNewNote(npcParams);
+		Notecard = npcParams;
+	}
+	else if (npcAction == "@attach")
+	{
+		DoAttach(npcParams);
+	}
+	else if (npcAction == "@teleport")
+	{
+		DoTeleport(npcParams);
+	}
+	else if (npcAction == "@reset")
+	{
+		DoDelete();
+		SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
+	}
+
+	STATE = NULL;
+	TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack
 }
- 
+
 
 
 /////////////////// UTILITY Functions, not state-like //////////////////
 
 // DEBUG(string) will chat a string or display it as hovertext if debug == TRUE
 DEBUG(string str) {
-    if (debug && ! LSLEditor)
-        llOwnerSay( str);                    // Send the owner debug info 
-    if (debug &&  LSLEditor)
-        llSay(0, str);                    // Send to the Console in LSLEDitor 
-    if (iTitleText) {
-        llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
-    
-    }
-} 
+	if (debug && ! LSLEditor)
+		llOwnerSay( str);                    // Send the owner debug info
+	if (debug &&  LSLEditor)
+		llSay(0, str);                    // Send to the Console in LSLEDitor
+	if (iTitleText) {
+		llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
+
+	}
+}
 
 GetDest(string npcParams) {
-    list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
-    vDestPos.x = llList2Float(dest, 0);
-    vDestPos.y = llList2Float(dest, 1);
-    vDestPos.z = llList2Float(dest, 2);
+	list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
+	vDestPos.x = llList2Float(dest, 0);
+	vDestPos.y = llList2Float(dest, 1);
+	vDestPos.z = llList2Float(dest, 2);
 }
 
 NPCReadNoteCard(string Note) {
-    DEBUG("NPCReadNoteCard");             
-    lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
-}  
-  
+	DEBUG("NPCReadNoteCard");
+	lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
+}
+
 integer SenseAvatar()
 {
-    //Returns a strided list of the UUID, position, and name of each avatar in the region
-    list avatars = llGetAgentList(AGENT_LIST_REGION ,[]);
-    integer numOfAvatars = llGetListLength(avatars);
-    if (numOfAvatars == 0)
-    {
-        DEBUG("No people");
-        return 0;
-    }
-    //DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's"); 
-        
-    integer nAvatars;
-    integer i;
-    for( i = 0;i < numOfAvatars; i++) {
-        key aviKey = llList2Key(avatars,i);
-        if (!osIsNpc(aviKey)) {
-            list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
-            vector pos = llList2Vector(detail,0);
-            float dist = llVecDist(pos, llGetPos());
-            if (dist  < RANGE)
-            {
-                nAvatars++;
-                DEBUG("In range:" + llKey2Name(aviKey));
-            }
-        }
-    }
-    //DEBUG("Located " + (string) nAvatars + " avatars");
-    return nAvatars;
-} 
- 
+	//Returns a strided list of the UUID, position, and name of each avatar in the region
+	list avatars = llGetAgentList(AGENT_LIST_REGION ,[]);
+	integer numOfAvatars = llGetListLength(avatars);
+	if (numOfAvatars == 0)
+	{
+		DEBUG("No people");
+		return 0;
+	}
+	//DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's");
+
+	integer nAvatars;
+	integer i;
+	for( i = 0;i < numOfAvatars; i++) {
+		key aviKey = llList2Key(avatars,i);
+		if (!osIsNpc(aviKey)) {
+			list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
+			vector pos = llList2Vector(detail,0);
+			float dist = llVecDist(pos, llGetPos());
+			if (dist  < RANGE)
+			{
+				nAvatars++;
+				DEBUG("In range:" + llKey2Name(aviKey));
+			}
+		}
+	}
+	//DEBUG("Located " + (string) nAvatars + " avatars");
+	return nAvatars;
+}
+
 // return TRUE if the avatar is owner when private is set, or TRUE if the avatar is in the same group and GROUP is set.
 integer checkPerms() {
 
-    integer group = (integer) KeyValueGet("pr");
-    if (! group)
-        priPub = "Owner Only";
-    else
-        priPub = "Group";
-    
-    
-    if (llDetectedKey(0) == llGetOwner()){
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
- 
-    if ( group && llDetectedGroup(0)) {
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
-    kUserKey = llDetectedKey(0);
-    return FALSE;
+	integer group = (integer) KeyValueGet("pr");
+	if (! group)
+		priPub = "Owner Only";
+	else
+		priPub = "Group";
+
+
+	if (llDetectedKey(0) == llGetOwner()){
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+
+	if ( group && llDetectedGroup(0)) {
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+	kUserKey = llDetectedKey(0);
+	return FALSE;
 }
 
 
 
 NPCAnimate(string anim)
 {
-    DEBUG("Start Anim: " + anim);
-    if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
-        
-        if (lastANIM != anim) {
-            if(llStringLength(lastANIM)) {
-                osNpcStopAnimation(NPCKey(), lastANIM);  
-            }
-            osNpcPlayAnimation(NPCKey(), anim);
-            lastANIM = anim;
-        }            
-    } else {
-        llSay(DEBUG_CHANNEL, "No animation named " + anim);
-    }
-} 
+	DEBUG("Start Anim: " + anim);
+	if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
+
+		if (lastANIM != anim) {
+			if(llStringLength(lastANIM)) {
+				osNpcStopAnimation(NPCKey(), lastANIM);
+			}
+			osNpcPlayAnimation(NPCKey(), anim);
+			lastANIM = anim;
+		}
+	} else {
+			llSay(DEBUG_CHANNEL, "No animation named " + anim);
+	}
+}
 
 // Kill a NPC by Name
 Kill(string param)
 {
-    integer count;
-    list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\    
-    integer i;
-    integer j = llGetListLength(avatars);
-    for (i=0 ; i <= j; i+=3){
-        
-        string desired = llList2String(avatars,i+2);
-        desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
-        
-        if (desired == param){
-            vector v = llList2Vector(avatars,i+1);
-            key target = llList2Key(avatars,i);    // get the UUID of the avatar
-            osNpcRemove(target);
-            
-            llOwnerSay("Removed " + param+ " at  location " + (string) v);
-            count++;
-        }
-    }
-    
-    NPCEnabled = FALSE; // not in world
-    SaveKey(NULL_KEY );    // Rev 4.4
-    
-    if (count)
-        llOwnerSay("Removed " + (string) count + " NPC's");
-    else
-        llOwnerSay("Could not locate " + param);
+	integer count;
+	list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\
+	integer i;
+	integer j = llGetListLength(avatars);
+	for (i=0 ; i <= j; i+=3){
+
+		string desired = llList2String(avatars,i+2);
+		desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
+
+		if (desired == param){
+			vector v = llList2Vector(avatars,i+1);
+			key target = llList2Key(avatars,i);    // get the UUID of the avatar
+			osNpcRemove(target);
+
+			llOwnerSay("Removed " + param+ " at  location " + (string) v);
+			count++;
+		}
+	}
+
+	NPCEnabled = FALSE; // not in world
+	SaveKey(NULL_KEY );    // Rev 4.4
+
+	if (count)
+		llOwnerSay("Removed " + (string) count + " NPC's");
+	else
+		llOwnerSay("Could not locate " + param);
 }
 
 
 // return a String for the position we are at. Strings used as the caller wants strings
 string Pos()
 {
-    vector where = llGetPos(); // find the box position
-   
-    where.z +=    OffsetZ;  // use the ground position + an offset 
-        
-    if (LSLEditor)
-        where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
-   
-   // if attached the height will be too high by 1/2 the agent size
-    if (llGetAttached()) {
-        vector size = llGetAgentSize(llGetOwner());   
-        float Z = size.z;
-        where.z -= Z/2;  
-    }
-   
-    // DEBUG("Pos= " + (string) where);
-    return (string) where;
+	vector where = llGetPos(); // find the box position
+
+	where.z +=    OffsetZ;  // use the ground position + an offset
+
+	if (LSLEditor)
+		where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
+
+	// if attached the height will be too high by 1/2 the agent size
+	if (llGetAttached()) {
+		vector size = llGetAgentSize(llGetOwner());
+		float Z = size.z;
+		where.z -= Z/2;
+	}
+
+	// DEBUG("Pos= " + (string) where);
+	return (string) where;
 }
 
 // setup a menu with a timer for timeouts, called by all make*()
 menu()
 {
-    llListenRemove(iHandle);
-    iChannel = llCeil(llFrand(100000) + 20000);
-    iHandle = llListen(iChannel,"","","");
-    TimerEvent(30.0);
-    MENU = TRUE;
+	llListenRemove(iHandle);
+	iChannel = llCeil(llFrand(100000) + 20000);
+	iHandle = llListen(iChannel,"","","");
+	TimerEvent(30.0);
+	MENU = TRUE;
 }
 
 // make a text box
 makeText(string Param)
-{ 
-    menu();
-    llTextBox(kUserKey, Param, iChannel);
+{
+	menu();
+	llTextBox(kUserKey, Param, iChannel);
 }
 
 // top level menu
 makeMainMenu()
 {
-    menu();
-    list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
+	menu();
+	list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
 }
 
 
@@ -1022,11 +1022,11 @@ makeMainMenu()
 // top level menu for non group/ non owners
 makeUserMenu()
 {
-    if (!allowUsers) return;
-    
-    menu();
-    list buttons = ["Start NPC","Stop NPC"];
-    llDialog(kUserKey,"Choose",buttons,iChannel);
+	if (!allowUsers) return;
+
+	menu();
+	list buttons = ["Start NPC","Stop NPC"];
+	llDialog(kUserKey,"Choose",buttons,iChannel);
 }
 
 
@@ -1034,199 +1034,199 @@ makeUserMenu()
 // programmable menu for @commands
 makeMenu(list buttons)
 {
-    menu();
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
+	menu();
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
 }
 
 
 // make one or two text boxes with prompts
 Text(string cmd, string p1, string p2)
 {
-    sCommand = cmd;
-     sParam2 = "";
-    if (llStringLength(p2))
-        sParam2 = p2;
+	sCommand = cmd;
+	sParam2 = "";
+	if (llStringLength(p2))
+		sParam2 = p2;
 
-    makeText(p1);
-} 
+	makeText(p1);
+}
 
 // Set the Avatar Present flag - if sensors are off and we are force run, there will be one present.
 ProcessSensor()
 {
-    integer SensorOn;
-    if ("on" == KeyValueGet("se"))
-    {
-        SensorOn = TRUE;        // we need to scan for avatars
-    } else {
-        SensorOn = FALSE;        // we need to scan for avatars
-    }
-    DEBUG("Sensor:" + (string) SensorOn);
-    
-    integer n = SenseAvatar();
-    
-    DEBUG("Avatars:" + (string) n);
-    if (SensorOn && n)
-        avatarPresent = TRUE;   // someone is here and we need to tell the system to run
-    else if (SensorOn && !n)
-        avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
-    else {       // sensor is off, lete see if there is a NPC. If so, we are ON 
-       // DEBUG("NPCEnabled:" + (string) NPCEnabled);
-       
-        if (NPCEnabled)
-            avatarPresent = TRUE;  
-        else
-            avatarPresent = FALSE;   
-    }
-    
-    //  start up from when when no one is near
-    if (avatarPresent && STATE == NobodyHome)
-        STATE = NULL;
-    
-    DEBUG("Avatar Present: " + (string) avatarPresent);
+	integer SensorOn;
+	if ("on" == KeyValueGet("se"))
+	{
+		SensorOn = TRUE;        // we need to scan for avatars
+	} else {
+			SensorOn = FALSE;        // we need to scan for avatars
+	}
+	DEBUG("Sensor:" + (string) SensorOn);
+
+	integer n = SenseAvatar();
+
+	DEBUG("Avatars:" + (string) n);
+	if (SensorOn && n)
+		avatarPresent = TRUE;   // someone is here and we need to tell the system to run
+	else if (SensorOn && !n)
+		avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
+	else {       // sensor is off, lete see if there is a NPC. If so, we are ON
+		// DEBUG("NPCEnabled:" + (string) NPCEnabled);
+
+		if (NPCEnabled)
+			avatarPresent = TRUE;
+		else
+			avatarPresent = FALSE;
+	}
+
+	//  start up from when when no one is near
+	if (avatarPresent && STATE == NobodyHome)
+		STATE = NULL;
+
+	DEBUG("Avatar Present: " + (string) avatarPresent);
 }
 
 vector CirclePoint(float radius) {
-    float x = llFrand(radius *2) - radius;        // +/- radius, randomized
-    float y = llFrand(radius *2) - radius;        // +/- radius, randomized
-    return <x, y, 0>;        // so this should always happen
+	float x = llFrand(radius *2) - radius;        // +/- radius, randomized
+	float y = llFrand(radius *2) - radius;        // +/- radius, randomized
+	return <x, y, 0>;        // so this should always happen
 }
 
 string KeyValueGet(string var) {
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k != var) jump continue;
-        //DEBUG("got " + var + " = " +  llList2String(data, 1));
-        return llList2String(data, 1);
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    return "";
-} 
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k != var) jump continue;
+		//DEBUG("got " + var + " = " +  llList2String(data, 1));
+		return llList2String(data, 1);
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	return "";
+}
 
 KeyValueSet(string var, string val) {
 
-    //DEBUG("set " + var + " = " + val);
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    if(llGetListLength(dVars) == 0)
-    {
-        llSetObjectDesc(var + "=" + val);
-        return;
-    }
-    list result = [];
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k == "") jump continue;
-        if(k == var && val == "") jump continue;
-        if(k == var) {
-            result += k + "=" + val;
-            val = "";
-            jump continue;
-        }
-        string v = llList2String(data, 1);
-        if(v == "") jump continue;
-        result += k + "=" + v;
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    if(val != "") result += var + "=" + val;
-    llSetObjectDesc(llDumpList2String(result, "&"));
+	//DEBUG("set " + var + " = " + val);
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	if(llGetListLength(dVars) == 0)
+	{
+		llSetObjectDesc(var + "=" + val);
+		return;
+	}
+	list result = [];
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k == "") jump continue;
+		if(k == var && val == "") jump continue;
+		if(k == var) {
+			result += k + "=" + val;
+			val = "";
+			jump continue;
+		}
+		string v = llList2String(data, 1);
+		if(v == "") jump continue;
+		result += k + "=" + v;
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	if(val != "") result += var + "=" + val;
+	llSetObjectDesc(llDumpList2String(result, "&"));
 }
 
 
 // clear RAM
 Clr() {
 
-    lCommands = [];
-    llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
-    makeMainMenu();
+	lCommands = [];
+	llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
+	makeMainMenu();
 }
 
 integer checkNoteCards()
 {
-    // Check that they have saved an Appeaance and Path notecard
-    integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
-    
-    integer i;
-    integer count;
-    for (; i < num; i++){
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
-            count++;
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
-            count++;
-    }
-    DEBUG("Checked " + (string) count + " Notecards");
-    // if we have both, run the NPC
-    return count;
+	// Check that they have saved an Appeaance and Path notecard
+	integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
+
+	integer i;
+	integer count;
+	for (; i < num; i++){
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
+			count++;
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
+			count++;
+	}
+	DEBUG("Checked " + (string) count + " Notecards");
+	// if we have both, run the NPC
+	return count;
 }
 
 Update(string SName) {
-         
-    // delete all NPC* scripts except myself
-    integer i;
-    integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
-    for (i = 0; i < j; i++) {
-        string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
-        string match = llGetSubString(targetName,0,2);
-        
-        if (match == SName && llGetScriptName() != targetName){
-                llOwnerSay("Upgrading " + targetName);
-            if (! LSLEditor){        // lets not kill the editor
-                llRemoveInventory(targetName);
-            }
-        }
-    }
+
+	// delete all NPC* scripts except myself
+	integer i;
+	integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
+	for (i = 0; i < j; i++) {
+		string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
+		string match = llGetSubString(targetName,0,2);
+
+		if (match == SName && llGetScriptName() != targetName){
+			llOwnerSay("Upgrading " + targetName);
+			if (! LSLEditor){        // lets not kill the editor
+				llRemoveInventory(targetName);
+			}
+		}
+	}
 }
 
 // Get all default saved params from the Description
 GetSwitches()
 {
-         string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
-        if (rA == "A")
-            relAbs = "Absolute";
-        else  if (rA == "R")
-            relAbs = "Relative";
-        else
-            relAbs = "Absolute";
+	string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
+	if (rA == "A")
+		relAbs = "Absolute";
+	else  if (rA == "R")
+		relAbs = "Relative";
+	else
+		relAbs = "Absolute";
 
-            
-        // reenable NPC if sensor is on.
-        if ("on" == KeyValueGet("se"))
-        {
-            NPCEnabled = TRUE;
-            mSensor  = "Sense is On";
-            ProcessSensor();       // fake 1 avatar to get it rezzed
-        } else {
-            mSensor  = "Sense is Off";
-        }
-    }
+
+	// reenable NPC if sensor is on.
+	if ("on" == KeyValueGet("se"))
+	{
+		NPCEnabled = TRUE;
+		mSensor  = "Sense is On";
+		ProcessSensor();       // fake 1 avatar to get it rezzed
+	} else {
+			mSensor  = "Sense is Off";
+	}
+}
 
 
 SaveKey(key akey)
 {
-    DEBUG("Saving Key of " + (string) akey);
-    KeyValueSet("key", akey);
-    if (akey !=  (key) KeyValueGet("key") )
-    {
-        DEBUG("Fatal error, cannot save key");
-    }
-    gNpcKey = akey;
+	DEBUG("Saving Key of " + (string) akey);
+	KeyValueSet("key", akey);
+	if (akey !=  (key) KeyValueGet("key") )
+	{
+		DEBUG("Fatal error, cannot save key");
+	}
+	gNpcKey = akey;
 }
 
 
 key NPCKey()
 {
-    key akey = gNpcKey;   // from cached copy
-    // gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
-    if (gNpcKey == NULL_KEY)
-    {
-        //DEBUG("Get DKey");
-        akey = KeyValueGet("key");    // from Description of the prim
-    }
-   // DEBUG("NPC KEY:" + (string) akey);   
-    return  akey;
+	key akey = gNpcKey;   // from cached copy
+	// gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
+	if (gNpcKey == NULL_KEY)
+	{
+		//DEBUG("Get DKey");
+		akey = KeyValueGet("key");    // from Description of the prim
+	}
+	// DEBUG("NPC KEY:" + (string) akey);
+	return  akey;
 }
 
 
@@ -1235,453 +1235,453 @@ key NPCKey()
 
 default
 {
-    changed(integer change) {
-        if(change & CHANGED_REGION_START) {
-            llResetScript();
-        }
-    }
-    
-    on_rez(integer start_param)
-    {
-        llResetScript();
-    }
+	changed(integer change) {
+		if(change & CHANGED_REGION_START) {
+			llResetScript();
+		}
+	}
 
-    state_entry() {
-        
-        llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
-        DoDelete(); // kill any NPC that is out running
-        Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
-        GetSwitches(); // Get all default saved params from the Description
+	on_rez(integer start_param)
+	{
+		llResetScript();
+	}
 
-        // 4.1 allow listeners to send us commands
-        if (allowListener)
-            llListen(link_Channel,"","","");
-        TimerEvent(TIMER);
-    } 
+	state_entry() {
+
+		llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
+		DoDelete(); // kill any NPC that is out running
+		Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
+		GetSwitches(); // Get all default saved params from the Description
+
+		// 4.1 allow listeners to send us commands
+		if (allowListener)
+			llListen(link_Channel,"","","");
+		TimerEvent(TIMER);
+	}
 
 
-    touch_start(integer n) 
-    {           // if touched, make a menu
-    
-        if (checkPerms()) {
-            if (RecordPath == STATE) {
-                makeMenu(lAtButtons); 
-            }   else {
-                makeMainMenu();
-            }
-        } else {
-            makeUserMenu();
-        }
-    }
+	touch_start(integer n)
+	{           // if touched, make a menu
 
-    // menu listener
-    listen(integer iChannel, string name, key id, string message) {
+		if (checkPerms()) {
+			if (RecordPath == STATE) {
+				makeMenu(lAtButtons);
+			}   else {
+					makeMainMenu();
+			}
+		} else {
+				makeUserMenu();
+		}
+	}
 
-        // process @commands that come in via the listener
-        if (iChannel == link_Channel)
-        {
-            ParseMsg(message);
-            return;
-        }
-        
-        if (MENU) {
-            llListenRemove(iHandle);
-            MENU = 0;       // menu is off
-            iHandle = 0;
-        }
-        
-        if (message == "Stop NPC")
-        {
-            lNpcCommandList = []; // force reload of notecard
-            NPCEnabled = FALSE;
-            if (NPCKey() != NULL_KEY){
-                Kill(sNPCName);
-            } else {
-                bNPC_STOP = TRUE;
-                makeText("Enter name of an NPC to stop");
-            }
-        }
-        else if (message == "Menu" ) {
-            makeMainMenu();
-        }
-        else if (message == "Erase RAM"){
-            Clr();
-        }
-        else if (message == "Relative"){
-            relAbs = "Absolute";
-            KeyValueSet("co","A");   // remember coordinates = A
-            Clr();
-        }
-        else if (message == "Absolute"){
-            relAbs = "Relative";
-            KeyValueSet("co","R");   // remember coordinates = R
-            Clr();
-        }
-        else if (message == "Recording"){
-            DoMenuForCommands();        // show them the recording menu
-        }
-        else if (message == "Owner Only") {
-            priPub = "Group";
-            KeyValueSet("pr","1");
+	// menu listener
+	listen(integer iChannel, string name, key id, string message) {
 
-            llOwnerSay("Group members have control");
-            makeMainMenu();
-        }
-        else if (message == "Group") {
-            priPub = "Owner Only";
-            KeyValueSet("pr","0");
-            llOwnerSay("Only you have control");
-            makeMainMenu();
-        }
-        else if (message == "Sense is On") {
-            mSensor ="Sense is Off";
-            KeyValueSet("se", "off");
-            llOwnerSay(mSensor);
-            makeMainMenu();
-        }
-        else if (message == "Sense is Off") {
-            mSensor ="Sense is On";
-            llOwnerSay(mSensor);
-            KeyValueSet("se", "on");
-            
-            NPCEnabled = TRUE;
-            
-            integer count = checkNoteCards();
-            if (count >= 2)  {
-                DEBUG("Notecards ok, DoProcessNPCLine");
-                DoProcessNPCLine();
-                return;
-            }
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
+		// process @commands that come in via the listener
+		if (iChannel == link_Channel)
+		{
+			ParseMsg(message);
+			return;
+		}
 
-            llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
-            makeMainMenu();
-        }
-        else if (message == "Appearance")  {
-            llRemoveInventory(Appearance);            // delete the notecard
-            osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard 
-            llOwnerSay("Your outfit has been saved");
-            makeMainMenu();
-        }
-        else if (message == "Save") {
-            if (llGetListLength(lCommands) == 0) {
-                llOwnerSay("Nothing recorded, you need to make a recording first");
-                makeMainMenu();
-                return;
-            }
-            DoSave();
-        }
-        else if (message == "Help"){
-            llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
-            makeMainMenu();
-        }
-        else if (message == "Start NPC")    {
-            integer count = checkNoteCards();
+		if (MENU) {
+			llListenRemove(iHandle);
+			MENU = 0;       // menu is off
+			iHandle = 0;
+		}
 
-            NPCEnabled = TRUE;
+		if (message == "Stop NPC")
+		{
+			lNpcCommandList = []; // force reload of notecard
+			NPCEnabled = FALSE;
+			if (NPCKey() != NULL_KEY){
+				Kill(sNPCName);
+			} else {
+					bNPC_STOP = TRUE;
+				makeText("Enter name of an NPC to stop");
+			}
+		}
+		else if (message == "Menu" ) {
+			makeMainMenu();
+		}
+		else if (message == "Erase RAM"){
+			Clr();
+		}
+		else if (message == "Relative"){
+			relAbs = "Absolute";
+			KeyValueSet("co","A");   // remember coordinates = A
+			Clr();
+		}
+		else if (message == "Absolute"){
+			relAbs = "Relative";
+			KeyValueSet("co","R");   // remember coordinates = R
+			Clr();
+		}
+		else if (message == "Recording"){
+			DoMenuForCommands();        // show them the recording menu
+		}
+		else if (message == "Owner Only") {
+			priPub = "Group";
+			KeyValueSet("pr","1");
 
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
-            
-            if (count >= 2) {
-                DEBUG("Notecards approved , calling DoProcessNPCLine");
-                SetStop(FALSE); // Let's run the notecard
-                DoProcessNPCLine();
-                return;
-            }
+			llOwnerSay("Group members have control");
+			makeMainMenu();
+		}
+		else if (message == "Group") {
+			priPub = "Owner Only";
+			KeyValueSet("pr","0");
+			llOwnerSay("Only you have control");
+			makeMainMenu();
+		}
+		else if (message == "Sense is On") {
+			mSensor ="Sense is Off";
+			KeyValueSet("se", "off");
+			llOwnerSay(mSensor);
+			makeMainMenu();
+		}
+		else if (message == "Sense is Off") {
+			mSensor ="Sense is On";
+			llOwnerSay(mSensor);
+			KeyValueSet("se", "on");
 
-            llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
-      
-        }
-        else if (bNPC_STOP){
-            bNPC_STOP = FALSE;
-            Kill(message);
-        }
-        else if (message == ">>"){
-            makeMenu(lMenu2);
-        }
-        else if (message == ">>>"){
-            makeMenu(lMenu3);
-        }
-        else if (message == "<<") {
-            makeMenu(lAtButtons);
-        }
-        else if (message == "<<<") {
-            makeMenu(lMenu2);
-        }
-        else if (message == "@comment"){
-            Text("# ","Enter a comment","");
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@run"){
-            lCommands += "@run=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@fly"){
-            lCommands += "@fly=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@land"){
-            lCommands += "@land=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@walk") {
-            lCommands += "@walk=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@sound"){
-            Text("@sound=","Enter a sound name or UUID to trigger","");
-        }
-        else if (message == "@randsound"){
-            lCommands += "@randsound"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@say") {
-            Text("@say=","Enter what the NPC will say","");
-        }
-        else if (message == "@whisper"){
-            Text("@whisper=","Enter what the NPC will whisper","");
-        }
-        else if (message == "@shout"){
-            Text("@shout=","Enter what the NPC will shout","");
-        }
-        else if (message == "@wander") {
-            Text("@wander=","Enter radius to wander","Enter number of wanders");
-        }
-        else if (message == "@pause") {
-            Text("@pause=","Enter time to pause","");
-        }
-        else if (message == "@rotate") {
-            Text("@rotate=","Enter degrees to rotate","");
-        }
-        else if (message == "@sit"){
-            Text("@sit=","Enter name of object to sit on","");
-        }
-        else if (message == "@teleport"){
-            lCommands += "@teleport=" + Pos() + "\n";
-            llOwnerSay("teleport to position: " + Pos());
-            makeMenu(lMenu3);
-        }
-        else if (message == "@touch"){
-            Text("@touch=","Enter name of object to touch","");
-        }
-        else if (message == "@cmd"){
-            Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
-        }
-        else if (message == "@stand"){
-            lCommands += "@stand\n";
-            llOwnerSay("Stand Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@animate"){
-            Text("@animate=","Enter animation name to play","Enter time to play the animation");
-        }
-        else if (message == "@attach"){
-            Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
-        }
-         else if (message == "@speed"){
-            Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
-        }
-               
+			NPCEnabled = TRUE;
 
-        // Save NPC name
-        else if (MakeNotecard == STATE) {
-            sNPCName = message; // in case we need to kill it.
-            
-            vector  vDest = (vector)  Pos();
+			integer count = checkNoteCards();
+			if (count >= 2)  {
+				DEBUG("Notecards ok, DoProcessNPCLine");
+				DoProcessNPCLine();
+				return;
+			}
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-            if (relAbs == "Relative")
-            {
-                vDest  -= llGetPos();    // just an offset for relative
-            }
-            sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
-            integer i;
-            integer j = llGetListLength(lCommands);
-            for (; i < j; i++){
-                // get the command to save to the notecard
-                string line = llList2String(lCommands,i);
-                if (relAbs == "Absolute") {
-                    sNotecard += line;    // add the un-modified string to the notecard
-                } else {
-                        // since we have to record absolute coords since we do not know where the box goes until they press Save,
-                        // we process the absolute to relative conversion for walks here
-                        list parts = llParseString2List(line,["="],[]); //get the @command
+			llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
+			makeMainMenu();
+		}
+		else if (message == "Appearance")  {
+			llRemoveInventory(Appearance);            // delete the notecard
+			osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard
+			llOwnerSay("Your outfit has been saved");
+			makeMainMenu();
+		}
+		else if (message == "Save") {
+			if (llGetListLength(lCommands) == 0) {
+				llOwnerSay("Nothing recorded, you need to make a recording first");
+				makeMainMenu();
+				return;
+			}
+			DoSave();
+		}
+		else if (message == "Help"){
+			llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
+			makeMainMenu();
+		}
+		else if (message == "Start NPC")    {
+			integer count = checkNoteCards();
 
-                    if (llList2String(parts,0) == "@walk") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@walk=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@fly") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@fly=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@run") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@run=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@land") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@land=" + (string) vec + "\n";
-                    }
-                    else {
-                        sNotecard += line;    // add the un-modified string to the notecard
-                    }
-                }
-            }
-            llRemoveInventory(Notecard);        // delete the old notecard
-            osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
-            llSay(0,sNotecard);
-            llOwnerSay("Commands notecard has been written");
-            STATE = NULL;
-        } // MakeNotecard
+			NPCEnabled = TRUE;
 
-        else  if (! llStringLength(sParam2)) {
-            lCommands +=  sCommand + message + "\n";
-            llOwnerSay("Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (llStringLength(sParam2)){
-            sCommand = sCommand + message + "|";
-            llOwnerSay("Recorded");
-            makeText(sParam2);
-            sParam2 = "";
-        }
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-    }
+			if (count >= 2) {
+				DEBUG("Notecards approved , calling DoProcessNPCLine");
+				SetStop(FALSE); // Let's run the notecard
+				DoProcessNPCLine();
+				return;
+			}
+
+			llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
+
+		}
+		else if (bNPC_STOP){
+			bNPC_STOP = FALSE;
+			Kill(message);
+		}
+		else if (message == ">>"){
+			makeMenu(lMenu2);
+		}
+		else if (message == ">>>"){
+			makeMenu(lMenu3);
+		}
+		else if (message == "<<") {
+			makeMenu(lAtButtons);
+		}
+		else if (message == "<<<") {
+			makeMenu(lMenu2);
+		}
+		else if (message == "@comment"){
+			Text("# ","Enter a comment","");
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@run"){
+			lCommands += "@run=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@fly"){
+			lCommands += "@fly=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@land"){
+			lCommands += "@land=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@walk") {
+			lCommands += "@walk=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@sound"){
+			Text("@sound=","Enter a sound name or UUID to trigger","");
+		}
+		else if (message == "@randsound"){
+			lCommands += "@randsound"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@say") {
+			Text("@say=","Enter what the NPC will say","");
+		}
+		else if (message == "@whisper"){
+			Text("@whisper=","Enter what the NPC will whisper","");
+		}
+		else if (message == "@shout"){
+			Text("@shout=","Enter what the NPC will shout","");
+		}
+		else if (message == "@wander") {
+			Text("@wander=","Enter radius to wander","Enter number of wanders");
+		}
+		else if (message == "@pause") {
+			Text("@pause=","Enter time to pause","");
+		}
+		else if (message == "@rotate") {
+			Text("@rotate=","Enter degrees to rotate","");
+		}
+		else if (message == "@sit"){
+			Text("@sit=","Enter name of object to sit on","");
+		}
+		else if (message == "@teleport"){
+			lCommands += "@teleport=" + Pos() + "\n";
+			llOwnerSay("teleport to position: " + Pos());
+			makeMenu(lMenu3);
+		}
+		else if (message == "@touch"){
+			Text("@touch=","Enter name of object to touch","");
+		}
+		else if (message == "@cmd"){
+			Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
+		}
+		else if (message == "@stand"){
+			lCommands += "@stand\n";
+			llOwnerSay("Stand Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@animate"){
+			Text("@animate=","Enter animation name to play","Enter time to play the animation");
+		}
+		else if (message == "@attach"){
+			Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
+		}
+		else if (message == "@speed"){
+			Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
+		}
+
+
+		// Save NPC name
+		else if (MakeNotecard == STATE) {
+			sNPCName = message; // in case we need to kill it.
+
+			vector  vDest = (vector)  Pos();
+
+			if (relAbs == "Relative")
+			{
+				vDest  -= llGetPos();    // just an offset for relative
+			}
+			sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
+			integer i;
+			integer j = llGetListLength(lCommands);
+			for (; i < j; i++){
+				// get the command to save to the notecard
+				string line = llList2String(lCommands,i);
+				if (relAbs == "Absolute") {
+					sNotecard += line;    // add the un-modified string to the notecard
+				} else {
+						// since we have to record absolute coords since we do not know where the box goes until they press Save,
+						// we process the absolute to relative conversion for walks here
+						list parts = llParseString2List(line,["="],[]); //get the @command
+
+					if (llList2String(parts,0) == "@walk") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@walk=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@fly") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@fly=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@run") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@run=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@land") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@land=" + (string) vec + "\n";
+					}
+					else {
+						sNotecard += line;    // add the un-modified string to the notecard
+					}
+				}
+			}
+			llRemoveInventory(Notecard);        // delete the old notecard
+			osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
+			llSay(0,sNotecard);
+			llOwnerSay("Commands notecard has been written");
+			STATE = NULL;
+		} // MakeNotecard
+
+		else  if (! llStringLength(sParam2)) {
+			lCommands +=  sCommand + message + "\n";
+			llOwnerSay("Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (llStringLength(sParam2)){
+			sCommand = sCommand + message + "|";
+			llOwnerSay("Recorded");
+			makeText(sParam2);
+			sParam2 = "";
+		}
+
+	}
 
 
 
-    timer(){
-       // DEBUG("tick");
-        
-        // if llDialog is up, kill the listener for the dialog box.
-        if (iHandle) {
-            llOwnerSay("Menu timed out");
-            llListenRemove(iHandle);
-            iHandle = 0;
-            return;             // ^^^^^^^^^^^^^^^^^^^^^^^
-        }
-        // if NoBodyHome, we are sensing for an avatar
-        else if (NobodyHome == STATE) {
-            ProcessSensor();
-            return;
-        }
-        // if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
-        else if (Spawning == STATE) {
-            STATE = NULL;
-            TimerEvent(TIMER);
-        }
-        // We end aniamtions with a timer
-        else if (Animate == STATE){
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-        }
-        
-        else if (Walking == STATE) {
-            if (--iWaitCounter) {
-                DEBUG("still walking...");
-                if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
-                    return;
-                }
-            }
+	timer(){
+		// DEBUG("tick");
 
-            DEBUG("At Destination: " + (string) newDest);
-            
-            // walk, fly, run, land
-            if (walkstate == 1) {
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 2)  {
-                    // nothing
-                } else if (walkstate == 3) {
-                     NPCAnimate(STAND);
-                     NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 4) {
-                llShout(FLIGHT,"landing");
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            }
-        }
-        // Wandering timer 
-        else if (Wander == STATE) {
-            if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
-                if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
-                    return;
-            }
+		// if llDialog is up, kill the listener for the dialog box.
+		if (iHandle) {
+			llOwnerSay("Menu timed out");
+			llListenRemove(iHandle);
+			iHandle = 0;
+			return;             // ^^^^^^^^^^^^^^^^^^^^^^^
+		}
+		// if NoBodyHome, we are sensing for an avatar
+		else if (NobodyHome == STATE) {
+			ProcessSensor();
+			return;
+		}
+		// if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
+		else if (Spawning == STATE) {
+			STATE = NULL;
+			TimerEvent(TIMER);
+		}
+		// We end aniamtions with a timer
+		else if (Animate == STATE){
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+		}
 
-            // see if wander counter == 0, if so, stop walking, go to stand and process next line
-            if(RAMwc == 0) {
-                NPCAnimate(STAND);
-                DEBUG("Wander ended, calling DoProcessNPCLine");
-                STATE = NULL;
-                return;
-            }
-            // one less time to wander around
-            RAMwc--;
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-            StateWanderhold();
-            return;
-        }
-        // Wandering requires us to re-wander when we reach a destination
-        else if (WanderHold == STATE) {
-            StateWander();
-            return;
-        }
-        else if (DoProcess == STATE) {
-            TimerEvent(QUICK);
-        }
+		else if (Walking == STATE) {
+			if (--iWaitCounter) {
+				DEBUG("still walking...");
+				if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
+					return;
+				}
+			}
 
-        STATE = NULL;
+			DEBUG("At Destination: " + (string) newDest);
 
-        // We always process a NPC line at end of timer.
-        DEBUG("Tick end, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-    }
+			// walk, fly, run, land
+			if (walkstate == 1) {
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 2)  {
+					// nothing
+				} else if (walkstate == 3) {
+						NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 4) {
+					llShout(FLIGHT,"landing");
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			}
+		}
+		// Wandering timer
+		else if (Wander == STATE) {
+			if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
+				if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
+					return;
+			}
 
-    // sensors are used for sitting on prims
-    // Neo Cortex: added different states to trigger sit or touch
-    sensor(integer num) {
-        if (Sit == STATE ) {
-            osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
-            DEBUG("Seated, calling DoProcessNPCLine");
-            
-            STATE = 0;
-        } else if (Touch == STATE) {
-            osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
-            DEBUG("Touched, calling DoProcessNPCLine");
-            STATE = 0;
-        }
-        DoProcessNPCLine();
-    }
-    no_sensor(){
-        DEBUG ("no target prim located, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-        STATE = NULL;
-    }
+			// see if wander counter == 0, if so, stop walking, go to stand and process next line
+			if(RAMwc == 0) {
+				NPCAnimate(STAND);
+				DEBUG("Wander ended, calling DoProcessNPCLine");
+				STATE = NULL;
+				return;
+			}
+			// one less time to wander around
+			RAMwc--;
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+			StateWanderhold();
+			return;
+		}
+		// Wandering requires us to re-wander when we reach a destination
+		else if (WanderHold == STATE) {
+			StateWander();
+			return;
+		}
+		else if (DoProcess == STATE) {
+			TimerEvent(QUICK);
+		}
+
+		STATE = NULL;
+
+		// We always process a NPC line at end of timer.
+		DEBUG("Tick end, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+	}
+
+	// sensors are used for sitting on prims
+	// Neo Cortex: added different states to trigger sit or touch
+	sensor(integer num) {
+		if (Sit == STATE ) {
+			osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
+			DEBUG("Seated, calling DoProcessNPCLine");
+
+			STATE = 0;
+		} else if (Touch == STATE) {
+				osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
+			DEBUG("Touched, calling DoProcessNPCLine");
+			STATE = 0;
+		}
+		DoProcessNPCLine();
+	}
+	no_sensor(){
+		DEBUG ("no target prim located, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+		STATE = NULL;
+	}
+
+
+	link_message(integer sender, integer num, string str, key id){
+		if (num == 0)
+			ParseMsg(str);
+	}
 
-    
-    link_message(integer sender, integer num, string str, key id){
-        if (num == 0)
-            ParseMsg(str);
-    }
-        
 }
 
 // __ END__
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.8.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.8.lsl
index 22dcc182..0a7134e2 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.8.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.8.lsl	
@@ -29,7 +29,7 @@
 // Rev 1.6 5-24-2014 move menu so you can get it by touching, removed many of the KeyValues to RAM for efficiency
 // Rev 1.7 CHANGED_REGION_START, not CHANGED_REGION_START (Opensim difference)
 // Rev 1.8 tuned up Kill NPC, added more flexible upgrader
-// Rev 1.9 Better script injection by link message// Rev 2.0 Added osSetSpeed so you can speed up or slow down an NPC. 
+// Rev 1.9 Better script injection by link message// Rev 2.0 Added osSetSpeed so you can speed up or slow down an NPC.
 // Rev 2.1 No laggy sensor used exept to sit on stuff
 // Rev 2.2 Various sensor fixes
 // Rev 2.3 Sets No Sensor in menu, must be started by hand
@@ -44,7 +44,7 @@
 // Rev 3.4 animation timer cannot be zero or it shuts off timer tweaked
 //         solves the NPC starting up when no sensor is set.
 // Rev 3.5 fixes saving to !Path  notecard
-// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted 
+// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted
 // Rev 3.7 08-11-2015 @attach command added to load an attachment from the inventory to the NPC
 // Rev 3.8 08-17-2015 process queued commands one at a time without calling ProcessNPCLine on link message
 // Rev 3.9 08-23-2011 Queued command fixes including @delete which were not always working
@@ -80,11 +80,11 @@
 // Merged with new Route recorder and notecard writer
 // If the NPC failed to reach a destination it never moved on.
 // Added WAIT global to tune this
-// Exposed many tunable variables and ported the code 
+// Exposed many tunable variables and ported the code
 // Added floating point to times in notecard.
 // Added @sound, @randsound, @whisper, @shout, and @cmd controls.
 // notecards integers are not floats for better control
-// 
+//
 // Link Messages may be used to perform external control by injecting @commands into the stream of actions
 // Example:
 // To chat something, such as with a chat robot
@@ -102,7 +102,7 @@
 //    Enabled = true
 //
 // and then the server has to be restarted.
-// please note that there are better ways to enable NPC in the latest Opensim.  
+// please note that there are better ways to enable NPC in the latest Opensim.
 
 // Commands: All commands begin with an @ sign.  All other lines are ignored
 // @commands may have optional parameters.  The syntax is always:
@@ -137,7 +137,7 @@
 //@attach     InventoryName               attachmentPoint         load an attachment from the inventory to the NPC onto point
 //@teleport   destination (vector)        NaN                     Makes the NPC teleport to destination in the same sim.  They cannot tp to another sim or across the HG
 //@reset      NaN                         NaN                     Deletes the NPC, starts the !Path notecard over.
- 
+
 // Constant            attachmentPoint Comment
 // ATTACH_CHEST            1    chest/sternum
 // ATTACH_HEAD             2    head
@@ -181,16 +181,16 @@
 // ATTACH_AVATAR_CENTER  40    avatar center/root
 
 
-  
+
 //////////////////////////////////////////////////////////
 //                  DEBUG                               //
 //////////////////////////////////////////////////////////
 integer debug = FALSE;
-         // set to TRUE or FALSE for debug chat on various actions
+// set to TRUE or FALSE for debug chat on various actions
 integer LSLEditor = FALSE;        // set to to TRUE to working in  LSLEditor, FALSE for in-world.
-                              // you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
+// you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
 integer iTitleText = FALSE;    // set to TRUE to see debug info in text above the controller
- 
+
 //////////////////////////////////////////////////////////
 //                  TUNABLE CONFIGURATION               //
 //////////////////////////////////////////////////////////
@@ -213,9 +213,9 @@ string    WALK = "Walk";       // the name of the default Walk animation
 string    FLY = "Fly";        // the name of the default Fly animation
 string    RUN = "Run";        // the name of the default Run animation
 string    LAND = "Land";      // the name of the default land animation ( for birds only)
-float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.  
+float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.
 float    SPEEDMULT =0.8;     // 1.0 = regular avatar speed. Smaller numbers slow down walks. Large numbers speed them up.
-integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing" 
+integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing"
 
 // DESCRIPTIONS FIELDS HAVE TO SURVIVE A RESET
 //  These vars are stored  by saving them with KeyValueSet
@@ -269,7 +269,7 @@ list lMenu3 = ["<<<","@notecard","@appearance", "@touch", "@speed",       "@atta
 string sCommand;  // place to store a command for two-prompted ones
 string sParam2;   // place to store a prompt for two-prompted ones
 string priPub = "Owner Only";    // Private or Group
-key kUserKey;        // the person who is controlling the avatar, not the Owner  
+key kUserKey;        // the person who is controlling the avatar, not the Owner
 // the command lists
 list lCommands;  // commands are stored here
 list lNpcCommandList; // Storage for the NPC script.
@@ -316,722 +316,722 @@ list Stack ;              // a command stack from link message input
 
 TimerEvent(float timesent)
 {
-    if (LSLEditor)
-        timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
-        
-    DEBUG("Setting  timer: " + (string) timesent);
-    llSetTimerEvent(timesent);
+	if (LSLEditor)
+		timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
+
+	DEBUG("Setting  timer: " + (string) timesent);
+	llSetTimerEvent(timesent);
 }
 
 // for 4.1 parse a message from a Listen or a Link message
 ParseMsg(string str) {
-    DEBUG("Command In:" + str);
-    if (str=="@go") {
-        SetStop(FALSE); // Let's run the notecard
-        DEBUG("@go running");
-        DoProcessNPCLine();
-    } else {
-        Stack += [str];    // take anything, the controller will filter away non @ stuff
-        if (STATE == NULL)
-            DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
-    }
+	DEBUG("Command In:" + str);
+	if (str=="@go") {
+		SetStop(FALSE); // Let's run the notecard
+		DEBUG("@go running");
+		DoProcessNPCLine();
+	} else {
+			Stack += [str];    // take anything, the controller will filter away non @ stuff
+		if (STATE == NULL)
+			DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
+	}
 }
 
 SetStop(integer what)
 {
-    DEBUG("Stopped set to " + (string ) what);
-    Stopped = what;
+	DEBUG("Stopped set to " + (string ) what);
+	Stopped = what;
 }
 // Do* functions are much like states from the old V2 scripts.
-    
+
 // Save a Path notecard
 DoSave()
-{ 
-    STATE = MakeNotecard;
-    makeText("Stand where you want the NPC to appear, and enter the NPC Name");
+{
+	STATE = MakeNotecard;
+	makeText("Stand where you want the NPC to appear, and enter the NPC Name");
 }
 
 // This function is used to record the path for the NPC
 // Each command can take 0, 1, or 2 params
 DoMenuForCommands() {
-    makeMenu(lAtButtons);
+	makeMenu(lAtButtons);
 }
 
 
 // No one is here when sensors were on, so we kill off the NPC
 DoNobodyHome()
 {
-    DEBUG("Nobody Home");
-    STATE = NobodyHome;
-    if (NPCKey() != NULL_KEY) {
-        osNpcRemove(NPCKey());
-        SaveKey(NULL_KEY);
-    }
-    TimerEvent(5);  // keep ticking to sense avatars   
+	DEBUG("Nobody Home");
+	STATE = NobodyHome;
+	if (NPCKey() != NULL_KEY) {
+		osNpcRemove(NPCKey());
+		SaveKey(NULL_KEY);
+	}
+	TimerEvent(5);  // keep ticking to sense avatars
 }
 
 
 ///////////////////////  STATELIKE BEHAVIOUR  /////////////
-// these StateXX functions need to wait on a timer to fire. 
+// these StateXX functions need to wait on a timer to fire.
 
 // Create a NPC
 StateSpawn() {
-    DEBUG("state spawn " + sNPCName);
-     
-    NPCEnabled = TRUE; //  in world
-    // see if there is already one out there.
-    if (NPCKey() != NULL_KEY) {
-        DEBUG("Already living");
-        return;
-    }
-    
-    STATE = Spawning;        
-    list name = llParseString2List(sNPCName, [" "], []);
-   
-    vector vRezPos = vInitialPos;
-    if (relAbs == "Relative"){
-        vRezPos += llGetPos();
-    }
+	DEBUG("state spawn " + sNPCName);
 
-   // llSay(0,llDumpList2String(name,",")); 
+	NPCEnabled = TRUE; //  in world
+	// see if there is already one out there.
+	if (NPCKey() != NULL_KEY) {
+		DEBUG("Already living");
+		return;
+	}
 
-    DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
-    key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+	STATE = Spawning;
+	list name = llParseString2List(sNPCName, [" "], []);
 
-    llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
-    SaveKey(aKey); // save in description and global, too
-    
-    osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
-    TimerEvent(REZTIME);
-    NPCAnimate(STAND);
+	vector vRezPos = vInitialPos;
+	if (relAbs == "Relative"){
+		vRezPos += llGetPos();
+	}
+
+	// llSay(0,llDumpList2String(name,","));
+
+	DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
+	key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+
+	llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
+	SaveKey(aKey); // save in description and global, too
+
+	osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
+	TimerEvent(REZTIME);
+	NPCAnimate(STAND);
 }
 
 StateSit() {
-    DEBUG ("state sit - looking for " + RAMsit);
-    STATE=Sit;
-    llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state sit - looking for " + RAMsit);
+	STATE=Sit;
+	llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
 
 StateTouch() {
-    DEBUG ("state touch - looking for " + RAMtouch);
-    STATE = Touch;
-    llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state touch - looking for " + RAMtouch);
+	STATE = Touch;
+	llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
- 
+
 DoStand() {
-    DEBUG("state stand");
-    osNpcStand(NPCKey());
+	DEBUG("state stand");
+	osNpcStand(NPCKey());
 }
 
 
 StateAnimate() {
-    
-    DEBUG("state animate");
-    STATE = Animate;
-    NPCAnimate(RAManimationName);
-    if (RAManimationTime <=0 )    // V 3.4 tweak
-        RAManimationTime = 1;
-    TimerEvent(RAManimationTime);
+
+	DEBUG("state animate");
+	STATE = Animate;
+	NPCAnimate(RAManimationName);
+	if (RAManimationTime <=0 )    // V 3.4 tweak
+		RAManimationTime = 1;
+	TimerEvent(RAManimationTime);
 }
-    
+
 StateWalk() {
 
-    DEBUG("Start Walk");
-    //DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
-    STATE = Walking;
-            
-    // walk, fly, run, land
-   if (walkstate == 1) {
-        NPCAnimate(WALK);
-    } else if (walkstate == 2)  {
-        llShout(FLIGHT,"flying");
-        NPCAnimate(FLY);
-    } else if (walkstate == 3) {
-        NPCAnimate(RUN);
-    } else if (walkstate == 4) {
-        NPCAnimate(LAND);
-    } 
-    newDest = vDestPos ;
-    newDest.z += OffsetZ;
-        
-    // notecard is stored as offsets from this box with relative addressing.  Convert to absolute
-    if (relAbs == "Relative"){
-        newDest += llGetPos();
-    }
+	DEBUG("Start Walk");
+	//DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
+	STATE = Walking;
 
-    DEBUG("Moveto:" + (string) newDest);
-    osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);
+	// walk, fly, run, land
+	if (walkstate == 1) {
+		NPCAnimate(WALK);
+	} else if (walkstate == 2)  {
+			llShout(FLIGHT,"flying");
+		NPCAnimate(FLY);
+	} else if (walkstate == 3) {
+			NPCAnimate(RUN);
+	} else if (walkstate == 4) {
+			NPCAnimate(LAND);
+	}
+	newDest = vDestPos ;
+	newDest.z += OffsetZ;
+
+	// notecard is stored as offsets from this box with relative addressing.  Convert to absolute
+	if (relAbs == "Relative"){
+		newDest += llGetPos();
+	}
+
+	DEBUG("Moveto:" + (string) newDest);
+	osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 
 StateWander(){
-    DEBUG("state wander");
-    STATE = Wander;
-    
-    vector point = CirclePoint(RAMwd);
-    DEBUG("CirclePoint:" + (string) point);
-    vWanderPos = vDestPos + point;
-    DEBUG("vWanderPos:" + (string) vWanderPos);
+	DEBUG("state wander");
+	STATE = Wander;
 
-    fTimerVal = WANDERTIME;    // default time to pause after each wander
-    if (WANDERRAND)
-        fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
+	vector point = CirclePoint(RAMwd);
+	DEBUG("CirclePoint:" + (string) point);
+	vWanderPos = vDestPos + point;
+	DEBUG("vWanderPos:" + (string) vWanderPos);
 
-    NPCAnimate(WALK);
+	fTimerVal = WANDERTIME;    // default time to pause after each wander
+	if (WANDERRAND)
+		fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
 
-    DEBUG("Wander to:" + (string) vWanderPos);
+	NPCAnimate(WALK);
 
-    osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);      
+	DEBUG("Wander to:" + (string) vWanderPos);
+
+	osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 StateWanderhold() {
 
-    DEBUG("Wander Hold");
-    STATE = WanderHold;
-       
-     // now that we have reached a wander spot, slow the timer down to the desired value
-    TimerEvent(fTimerVal);
+	DEBUG("Wander Hold");
+	STATE = WanderHold;
+
+	// now that we have reached a wander spot, slow the timer down to the desired value
+	TimerEvent(fTimerVal);
 }
 
 
- 
+
 DoRotate() {
-    DEBUG("@rotate=" + (string) RAMrot); 
-    osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
-}  
+	DEBUG("@rotate=" + (string) RAMrot);
+	osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
+}
 
 
 
 // @pause=10 will do nothing for 10 seconds
 DoPause() {
-    STATE = Paused;
-    if (RAMPause < 0.1)
-        RAMPause = 0.1;
-    DEBUG("@pause=" + (string)RAMPause);
-    TimerEvent(RAMPause);
+	STATE = Paused;
+	if (RAMPause < 0.1)
+		RAMPause = 0.1;
+	DEBUG("@pause=" + (string)RAMPause);
+	TimerEvent(RAMPause);
 }
 
 
 // @stop makes the NPC stop moving in whatever state it is in.  You have to linkmessage to get moving again
-DoStop() {    
-    DEBUG("NPC is Stopped");
-    STATE   = 0;    // accept commands
-    SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-    TimerEvent(0);
-    Stack = []; // v3.8
+DoStop() {
+	DEBUG("NPC is Stopped");
+	STATE   = 0;    // accept commands
+	SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+	TimerEvent(0);
+	Stack = []; // v3.8
 }
-    
+
 // @delete removes the NPC forever. Next command starts it up again at the beginning
 DoDelete() {
-    DEBUG("state delete");
-    osNpcRemove(NPCKey());
-    SaveKey(NULL_KEY);
-    TimerEvent(0);
-    Stack = []; // v3.8
-    STATE = NULL;    // accept commands
+	DEBUG("state delete");
+	osNpcRemove(NPCKey());
+	SaveKey(NULL_KEY);
+	TimerEvent(0);
+	Stack = []; // v3.8
+	STATE = NULL;    // accept commands
 }
 
 // change the appearance of the NPC
 DoAppearance(string notecard) {
-    DEBUG("state appearance");
-    if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
-        DEBUG("Load appearance " + notecard);
-        osNpcLoadAppearance(NPCKey(),notecard);
-    }
-    STATE = NULL;    // accept commands
+	DEBUG("state appearance");
+	if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
+		DEBUG("Load appearance " + notecard);
+		osNpcLoadAppearance(NPCKey(),notecard);
+	}
+	STATE = NULL;    // accept commands
 }
 
 // Change the avatar speed
 DoSpeed(string speed) {
-    float newspeed = (float) speed;
-    if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
-        osSetSpeed(NPCKey(),newspeed);
-    }
-    STATE = NULL;    // accept commands
+	float newspeed = (float) speed;
+	if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
+		osSetSpeed(NPCKey(),newspeed);
+	}
+	STATE = NULL;    // accept commands
 }
 
 DoTeleport(string params) {
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    vector Dest = (vector) itemName;
-    if (Dest != ZERO_VECTOR) {
-        if (relAbs == "Relative"){
-            Dest += llGetPos();
-        }
-        osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
-        
-    } else {
-        llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
-    }
-    STATE = NULL;    // accept commands
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	vector Dest = (vector) itemName;
+	if (Dest != ZERO_VECTOR) {
+		if (relAbs == "Relative"){
+			Dest += llGetPos();
+		}
+		osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
+
+	} else {
+			llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
+	}
+	STATE = NULL;    // accept commands
 }
 
 
 
 DoNewNote (string card) {
-    DEBUG("Load Notecard " + card);    
-    NPCReadNoteCard(card);
-    SetStop(FALSE);
-    STATE = NULL;    // accept commands
+	DEBUG("Load Notecard " + card);
+	NPCReadNoteCard(card);
+	SetStop(FALSE);
+	STATE = NULL;    // accept commands
 }
 DoAttach(string params) {
-    
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    integer attachmentPoint  = (integer) llList2String(Data, 1);
-    if (attachmentPoint > 0
-        && attachmentPoint < 40
-        && llGetInventoryType(itemName) == INVENTORY_OBJECT
-       )
-    {
-        osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
-    }
-    STATE = NULL;    // accept commands
+
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	integer attachmentPoint  = (integer) llList2String(Data, 1);
+	if (attachmentPoint > 0
+		&& attachmentPoint < 40
+			&& llGetInventoryType(itemName) == INVENTORY_OBJECT
+				)
+				{
+					osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
+				}
+	STATE = NULL;    // accept commands
 }
 
 // This loops over the notecard, processing each command
 DoProcessNPCLine() {
-    DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
-    
-    STATE = DoProcess;
-    
-        // auto load a notecard
-    if (! llGetListLength(lNpcCommandList)) {
-        DEBUG("Read Notecard");
-        NPCReadNoteCard(Notecard);
-    }
+	DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
 
-    // look for link messages on the stack
-    string next = llList2String(Stack,0);    // lets see if there is anything from a link message
-    if (llStringLength(next))
-    {
-        Stack = llDeleteSubList(Stack,0,0);
-        ProcessCmd(next);        //lets do this command instead.
-        return;
-    }
+	STATE = DoProcess;
 
-    // @stop issued?
-    if (Stopped) {
-        TimerEvent(0);
-        DEBUG("Stopped, waiting for input");
-        STATE = NULL;
-        return;
-    }
+	// auto load a notecard
+	if (! llGetListLength(lNpcCommandList)) {
+		DEBUG("Read Notecard");
+		NPCReadNoteCard(Notecard);
+	}
 
-    // No, we have an @go for liftoff
-    next = llList2String(lNpcCommandList, 0);        // get the next command
-    DEBUG("Execute:" + next);
-    lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
-        
-    if (llGetListLength(lNpcCommandList) == 0) {
-        DEBUG("EOF");
-    }
-    ProcessCmd(next);
-} 
+	// look for link messages on the stack
+	string next = llList2String(Stack,0);    // lets see if there is anything from a link message
+	if (llStringLength(next))
+	{
+		Stack = llDeleteSubList(Stack,0,0);
+		ProcessCmd(next);        //lets do this command instead.
+		return;
+	}
+
+	// @stop issued?
+	if (Stopped) {
+		TimerEvent(0);
+		DEBUG("Stopped, waiting for input");
+		STATE = NULL;
+		return;
+	}
+
+	// No, we have an @go for liftoff
+	next = llList2String(lNpcCommandList, 0);        // get the next command
+	DEBUG("Execute:" + next);
+	lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
+
+	if (llGetListLength(lNpcCommandList) == 0) {
+		DEBUG("EOF");
+	}
+	ProcessCmd(next);
+}
 
 
 
 ProcessCmd(string cmd) {
 
-    DEBUG("ProcessCmd:" + cmd);
+	DEBUG("ProcessCmd:" + cmd);
 
-    llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
-    if (llGetSubString(cmd, 0, 0) != "@") {
-        DEBUG("ignoring");
-        TimerEvent(QUICK);  // this is so we do not recurse the stack
-        STATE = NULL;
-        return;
-    }
+	llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
+	if (llGetSubString(cmd, 0, 0) != "@") {
+		DEBUG("ignoring");
+		TimerEvent(QUICK);  // this is so we do not recurse the stack
+		STATE = NULL;
+		return;
+	}
 
-    list data  = llParseString2List(cmd, ["="], []);
-    npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
+	list data  = llParseString2List(cmd, ["="], []);
+	npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
 
-    DEBUG("Action:" + npcAction);
-    npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
-    DEBUG("Params:" + npcParams);
-    
-    @commands;
+	DEBUG("Action:" + npcAction);
+	npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
+	DEBUG("Params:" + npcParams);
 
-    ProcessSensor();
-     if (! avatarPresent){
-        DoNobodyHome();
-        DEBUG("No avatar nearby");
-        STATE = NULL;
-        return;
-    }
-    
-    if(npcAction == "@spawn") {
-        DEBUG("@spawn npcParams ");
-        list spawnData = llParseString2List(npcParams, ["|"], []);
-        sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+	@commands;
 
-        vInitialPos = (vector) llList2String(spawnData, 1);        
-        DEBUG("Coords for NPC at " + (string) vInitialPos);
-        StateSpawn();
-        return;
-    }
-    
-    
-    if(npcAction == "@stop") {
-        DoStop();
-        STATE = NULL;
-        return;
-    }
-    else if(npcAction == "@goto") {
-        DEBUG("goto");
-        integer lastIdx = llGetListLength(lNpcCommandList)-1;
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
-        // Wind commands till goto label.
-        @wind;
-        string next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        if(next1 != npcParams) jump wind;
-        // Wind the label too.
-        next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        // Get next command.
-        list data1  = llParseString2List(next1, ["="], []);
-        npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
-        npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
-        // Reschedule.
-        jump commands;
-    }
-    else if(npcAction == "@sound") {
-        DEBUG("sound");
-        llTriggerSound(npcParams,1.0);
-    }
-    else if(npcAction == "@randsound") {
-        DEBUG("@randsound");
-        integer N = llGetInventoryNumber(INVENTORY_SOUND);
-        integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
-        string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
-        llTriggerSound(toPlay,1.0);
-    }
-    else if(npcAction == "@walk") {
-        DEBUG("@walk");
-        GetDest(npcParams);
-        walkstate = 1;//  walking
-        NPCWalkOption = OS_NPC_NO_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@fly") {
-        GetDest(npcParams);
-        walkstate = 2;//  flying
-        NPCWalkOption = OS_NPC_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@run") {
-        DEBUG("@run");
-        GetDest(npcParams);
-        walkstate = 3;//  running
-        NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@land") {
-        DEBUG("@land");
-        GetDest(npcParams);
-        walkstate = 4;//  landing
-        NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@say") {
-        DEBUG("@say " + npcParams);
-        osNpcSay(NPCKey(), 0, npcParams);
-    }
-    else if(npcAction == "@shout") {
-        DEBUG("@shout");
-        osNpcShout(NPCKey(),0, npcParams);
-    }
-    else if(npcAction == "@whisper") {
-        DEBUG("@whisper " + npcParams);
-        osNpcWhisper(NPCKey(),0, npcParams);
-    }
-    // speak a command on a channel, so you can open doors and control stuff.
-    else if(npcAction == "@cmd") {
-        DEBUG("@cmd");
-        list dataToSpeak = llParseString2List(npcParams, ["|"], []);
-        string channel = llList2String(dataToSpeak,0);
-        DEBUG("Channel:"+(string) channel);
-        integer iChannel = (integer) channel;
-        string stringToSpeak = llList2String(dataToSpeak,1);
-        llSay(iChannel, stringToSpeak);
-    }
-    // stop everything
-    else if(npcAction == "@pause") {
-        RAMPause = (float) npcParams;
-        DoPause();
-        return;
-    }
-    else if(npcAction == "@wander") {
-        list wanderData = llParseString2List(npcParams, ["|"], []);
-        RAMwd = (float) llList2String(wanderData, 0);
-        RAMwc = (integer) llList2String(wanderData, 1);
-        vDestPos = osNpcGetPos(NPCKey());        // set the wander start
-        DEBUG("Starting at " + (string) vDestPos);
-        StateWander();
-        return;
-    }
-    else if(npcAction == "@rotate") {
-        RAMrot = (float) npcParams;
-        DoRotate();
-    }
-    else if(npcAction == "@sit") {
-        RAMsit= npcParams;
-        StateSit();
-        return;
-    }
-    else if(npcAction == "@touch") {
-        RAMtouch= npcParams;
-        StateTouch();
-        return;
-    }
-    else  if(npcAction == "@stand") {
-        DoStand();
-    }
-    else if(npcAction == "@delete") {
-        DoDelete();
-        SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-        return;
-    }
-    else if(npcAction == "@animate") {
-        list animateData = llParseString2List(npcParams, ["|"], []);
-        RAManimationName = llList2String(animateData, 0);
-        RAManimationTime = (float) llList2String(animateData, 1);
-        StateAnimate();
-        return;
-    }
-    else if(npcAction == "@appearance" ){
-        DoAppearance(npcParams);
-    }
-    else if (npcAction =="@speed") {
-        DoSpeed(npcParams);
-    }
-    else if (npcAction =="@notecard") {      
-        DoNewNote(npcParams);
-        Notecard = npcParams;
-    }
-    else if (npcAction == "@attach")
-    {
-        DoAttach(npcParams);
-    }
-    else if (npcAction == "@teleport")
-    {
-        DoTeleport(npcParams);
-    }
-    else if (npcAction == "@reset")
-    {
-        DoDelete();
-        SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
-    }
+	ProcessSensor();
+	if (! avatarPresent){
+		DoNobodyHome();
+		DEBUG("No avatar nearby");
+		STATE = NULL;
+		return;
+	}
 
-    STATE = NULL;
-    TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack 
+	if(npcAction == "@spawn") {
+		DEBUG("@spawn npcParams ");
+		list spawnData = llParseString2List(npcParams, ["|"], []);
+		sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+
+		vInitialPos = (vector) llList2String(spawnData, 1);
+		DEBUG("Coords for NPC at " + (string) vInitialPos);
+		StateSpawn();
+		return;
+	}
+
+
+	if(npcAction == "@stop") {
+		DoStop();
+		STATE = NULL;
+		return;
+	}
+	else if(npcAction == "@goto") {
+		DEBUG("goto");
+		integer lastIdx = llGetListLength(lNpcCommandList)-1;
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
+		// Wind commands till goto label.
+		@wind;
+		string next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		if(next1 != npcParams) jump wind;
+		// Wind the label too.
+		next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		// Get next command.
+		list data1  = llParseString2List(next1, ["="], []);
+		npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
+		npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
+		// Reschedule.
+		jump commands;
+	}
+	else if(npcAction == "@sound") {
+		DEBUG("sound");
+		llTriggerSound(npcParams,1.0);
+	}
+	else if(npcAction == "@randsound") {
+		DEBUG("@randsound");
+		integer N = llGetInventoryNumber(INVENTORY_SOUND);
+		integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
+		string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
+		llTriggerSound(toPlay,1.0);
+	}
+	else if(npcAction == "@walk") {
+		DEBUG("@walk");
+		GetDest(npcParams);
+		walkstate = 1;//  walking
+		NPCWalkOption = OS_NPC_NO_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@fly") {
+		GetDest(npcParams);
+		walkstate = 2;//  flying
+		NPCWalkOption = OS_NPC_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@run") {
+		DEBUG("@run");
+		GetDest(npcParams);
+		walkstate = 3;//  running
+		NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@land") {
+		DEBUG("@land");
+		GetDest(npcParams);
+		walkstate = 4;//  landing
+		NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@say") {
+		DEBUG("@say " + npcParams);
+		osNpcSay(NPCKey(), 0, npcParams);
+	}
+	else if(npcAction == "@shout") {
+		DEBUG("@shout");
+		osNpcShout(NPCKey(),0, npcParams);
+	}
+	else if(npcAction == "@whisper") {
+		DEBUG("@whisper " + npcParams);
+		osNpcWhisper(NPCKey(),0, npcParams);
+	}
+	// speak a command on a channel, so you can open doors and control stuff.
+	else if(npcAction == "@cmd") {
+		DEBUG("@cmd");
+		list dataToSpeak = llParseString2List(npcParams, ["|"], []);
+		string channel = llList2String(dataToSpeak,0);
+		DEBUG("Channel:"+(string) channel);
+		integer iChannel = (integer) channel;
+		string stringToSpeak = llList2String(dataToSpeak,1);
+		llSay(iChannel, stringToSpeak);
+	}
+	// stop everything
+	else if(npcAction == "@pause") {
+		RAMPause = (float) npcParams;
+		DoPause();
+		return;
+	}
+	else if(npcAction == "@wander") {
+		list wanderData = llParseString2List(npcParams, ["|"], []);
+		RAMwd = (float) llList2String(wanderData, 0);
+		RAMwc = (integer) llList2String(wanderData, 1);
+		vDestPos = osNpcGetPos(NPCKey());        // set the wander start
+		DEBUG("Starting at " + (string) vDestPos);
+		StateWander();
+		return;
+	}
+	else if(npcAction == "@rotate") {
+		RAMrot = (float) npcParams;
+		DoRotate();
+	}
+	else if(npcAction == "@sit") {
+		RAMsit= npcParams;
+		StateSit();
+		return;
+	}
+	else if(npcAction == "@touch") {
+		RAMtouch= npcParams;
+		StateTouch();
+		return;
+	}
+	else  if(npcAction == "@stand") {
+		DoStand();
+	}
+	else if(npcAction == "@delete") {
+		DoDelete();
+		SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+		return;
+	}
+	else if(npcAction == "@animate") {
+		list animateData = llParseString2List(npcParams, ["|"], []);
+		RAManimationName = llList2String(animateData, 0);
+		RAManimationTime = (float) llList2String(animateData, 1);
+		StateAnimate();
+		return;
+	}
+	else if(npcAction == "@appearance" ){
+		DoAppearance(npcParams);
+	}
+	else if (npcAction =="@speed") {
+		DoSpeed(npcParams);
+	}
+	else if (npcAction =="@notecard") {
+		DoNewNote(npcParams);
+		Notecard = npcParams;
+	}
+	else if (npcAction == "@attach")
+	{
+		DoAttach(npcParams);
+	}
+	else if (npcAction == "@teleport")
+	{
+		DoTeleport(npcParams);
+	}
+	else if (npcAction == "@reset")
+	{
+		DoDelete();
+		SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
+	}
+
+	STATE = NULL;
+	TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack
 }
- 
+
 
 
 /////////////////// UTILITY Functions, not state-like //////////////////
 
 // DEBUG(string) will chat a string or display it as hovertext if debug == TRUE
 DEBUG(string str) {
-    if (debug && ! LSLEditor)
-        llOwnerSay( str);                    // Send the owner debug info 
-    if (debug &&  LSLEditor)
-        llSay(0, str);                    // Send to the Console in LSLEDitor 
-    if (iTitleText) {
-        llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
-    
-    }
-} 
+	if (debug && ! LSLEditor)
+		llOwnerSay( str);                    // Send the owner debug info
+	if (debug &&  LSLEditor)
+		llSay(0, str);                    // Send to the Console in LSLEDitor
+	if (iTitleText) {
+		llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
+
+	}
+}
 
 GetDest(string npcParams) {
-    list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
-    vDestPos.x = llList2Float(dest, 0);
-    vDestPos.y = llList2Float(dest, 1);
-    vDestPos.z = llList2Float(dest, 2);
+	list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
+	vDestPos.x = llList2Float(dest, 0);
+	vDestPos.y = llList2Float(dest, 1);
+	vDestPos.z = llList2Float(dest, 2);
 }
 
 NPCReadNoteCard(string Note) {
-    DEBUG("NPCReadNoteCard");             
-    lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
-}  
-  
+	DEBUG("NPCReadNoteCard");
+	lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
+}
+
 integer SenseAvatar()
 {
-    //Returns a strided list of the UUID, position, and name of each avatar in the region
-//    list avatars = llGetAgentList(AGENT_LIST_PARCEL ,[]);
-    list avatars;
-    list avatarNames = osGetAgents();
-    integer i;
-    for (i = 0 ; i < llGetListLength(avatarNames); i++)
-    {
-        string fullname = llList2String(avatarNames,i);
-        //DEBUG("Found:" + fullname);
-        list name = llParseString2List(fullname,[" "],[]);
-        
-        key aviKey =osAvatarName2Key(llList2String(name,0),llList2String(name,1));
-        avatars += aviKey;
-    }
-    
-    integer numOfAvatars = llGetListLength(avatars);
-    if (numOfAvatars == 0)
-    {
-        DEBUG("No people, no NPC's");
-        return 0;
-    }
-    DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's"); 
-        
-    integer nAvatars;
-    
-    for( i = 0;i < numOfAvatars; i++) {
-        key aviKey = llList2Key(avatars,i);
-        if (!osIsNpc(aviKey)) {
-            list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
-            vector pos = llList2Vector(detail,0);
-            float dist = llVecDist(pos, llGetPos());
-            if (dist  < RANGE)
-            {
-                nAvatars++;
-                DEBUG("In range:" + llKey2Name(aviKey));
-            } else {
-               // DEBUG("*Not in range:" + llKey2Name(aviKey));
-            }
-        } else {
-          //  DEBUG("NPC: " + llKey2Name(aviKey));
-        }
-    }
-    //DEBUG("Located " + (string) nAvatars + " avatars");
-    return nAvatars;
-} 
- 
+	//Returns a strided list of the UUID, position, and name of each avatar in the region
+	//    list avatars = llGetAgentList(AGENT_LIST_PARCEL ,[]);
+	list avatars;
+	list avatarNames = osGetAgents();
+	integer i;
+	for (i = 0 ; i < llGetListLength(avatarNames); i++)
+	{
+		string fullname = llList2String(avatarNames,i);
+		//DEBUG("Found:" + fullname);
+		list name = llParseString2List(fullname,[" "],[]);
+
+		key aviKey =osAvatarName2Key(llList2String(name,0),llList2String(name,1));
+		avatars += aviKey;
+	}
+
+	integer numOfAvatars = llGetListLength(avatars);
+	if (numOfAvatars == 0)
+	{
+		DEBUG("No people, no NPC's");
+		return 0;
+	}
+	DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's");
+
+	integer nAvatars;
+
+	for( i = 0;i < numOfAvatars; i++) {
+		key aviKey = llList2Key(avatars,i);
+		if (!osIsNpc(aviKey)) {
+			list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
+			vector pos = llList2Vector(detail,0);
+			float dist = llVecDist(pos, llGetPos());
+			if (dist  < RANGE)
+			{
+				nAvatars++;
+				DEBUG("In range:" + llKey2Name(aviKey));
+			} else {
+					// DEBUG("*Not in range:" + llKey2Name(aviKey));
+				}
+		} else {
+				//  DEBUG("NPC: " + llKey2Name(aviKey));
+			}
+	}
+	//DEBUG("Located " + (string) nAvatars + " avatars");
+	return nAvatars;
+}
+
 // return TRUE if the avatar is owner when private is set, or TRUE if the avatar is in the same group and GROUP is set.
 integer checkPerms() {
 
-    integer group = (integer) KeyValueGet("pr");
-    if (! group)
-        priPub = "Owner Only";
-    else
-        priPub = "Group";
-    
-    
-    if (llDetectedKey(0) == llGetOwner()){
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
- 
-    if ( group && llDetectedGroup(0)) {
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
-    kUserKey = llDetectedKey(0);
-    return FALSE;
+	integer group = (integer) KeyValueGet("pr");
+	if (! group)
+		priPub = "Owner Only";
+	else
+		priPub = "Group";
+
+
+	if (llDetectedKey(0) == llGetOwner()){
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+
+	if ( group && llDetectedGroup(0)) {
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+	kUserKey = llDetectedKey(0);
+	return FALSE;
 }
 
 
 
 NPCAnimate(string anim)
 {
-    DEBUG("Start Anim: " + anim);
-    if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
-        
-        if (lastANIM != anim) {
-            if(llStringLength(lastANIM)) {
-                osNpcStopAnimation(NPCKey(), lastANIM);  
-            }
-            osNpcPlayAnimation(NPCKey(), anim);
-            lastANIM = anim;
-        }            
-    } else {
-        llSay(DEBUG_CHANNEL, "No animation named " + anim);
-    }
-} 
+	DEBUG("Start Anim: " + anim);
+	if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
+
+		if (lastANIM != anim) {
+			if(llStringLength(lastANIM)) {
+				osNpcStopAnimation(NPCKey(), lastANIM);
+			}
+			osNpcPlayAnimation(NPCKey(), anim);
+			lastANIM = anim;
+		}
+	} else {
+			llSay(DEBUG_CHANNEL, "No animation named " + anim);
+	}
+}
 
 // Kill a NPC by Name
 Kill(string param)
 {
-    integer count;
-    list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\    
-    integer i;
-    integer j = llGetListLength(avatars);
-    for (i=0 ; i <= j; i+=3){
-        
-        string desired = llList2String(avatars,i+2);
-        desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
-        
-        if (desired == param){
-            vector v = llList2Vector(avatars,i+1);
-            key target = llList2Key(avatars,i);    // get the UUID of the avatar
-            osNpcRemove(target);
-            
-            llOwnerSay("Removed " + param+ " at  location " + (string) v);
-            count++;
-        }
-    }
-    
-    NPCEnabled = FALSE; // not in world
-    SaveKey(NULL_KEY );    // Rev 4.4
-    
-    if (count)
-        llOwnerSay("Removed " + (string) count + " NPC's");
-    else
-        llOwnerSay("Could not locate " + param);
+	integer count;
+	list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\
+	integer i;
+	integer j = llGetListLength(avatars);
+	for (i=0 ; i <= j; i+=3){
+
+		string desired = llList2String(avatars,i+2);
+		desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
+
+		if (desired == param){
+			vector v = llList2Vector(avatars,i+1);
+			key target = llList2Key(avatars,i);    // get the UUID of the avatar
+			osNpcRemove(target);
+
+			llOwnerSay("Removed " + param+ " at  location " + (string) v);
+			count++;
+		}
+	}
+
+	NPCEnabled = FALSE; // not in world
+	SaveKey(NULL_KEY );    // Rev 4.4
+
+	if (count)
+		llOwnerSay("Removed " + (string) count + " NPC's");
+	else
+		llOwnerSay("Could not locate " + param);
 }
 
 
 // return a String for the position we are at. Strings used as the caller wants strings
 string Pos()
 {
-    vector where = llGetPos(); // find the box position
-   
-    where.z +=    OffsetZ;  // use the ground position + an offset 
-        
-    if (LSLEditor)
-        where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
-   
-   // if attached the height will be too high by 1/2 the agent size
-    if (llGetAttached()) {
-        vector size = llGetAgentSize(llGetOwner());   
-        float Z = size.z;
-        where.z -= Z/2;  
-    }
-   
-    // DEBUG("Pos= " + (string) where);
-    return (string) where;
+	vector where = llGetPos(); // find the box position
+
+	where.z +=    OffsetZ;  // use the ground position + an offset
+
+	if (LSLEditor)
+		where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
+
+	// if attached the height will be too high by 1/2 the agent size
+	if (llGetAttached()) {
+		vector size = llGetAgentSize(llGetOwner());
+		float Z = size.z;
+		where.z -= Z/2;
+	}
+
+	// DEBUG("Pos= " + (string) where);
+	return (string) where;
 }
 
 // setup a menu with a timer for timeouts, called by all make*()
 menu()
 {
-    llListenRemove(iHandle);
-    iChannel = llCeil(llFrand(100000) + 20000);
-    iHandle = llListen(iChannel,"","","");
-    TimerEvent(30.0);
-    MENU = TRUE;
+	llListenRemove(iHandle);
+	iChannel = llCeil(llFrand(100000) + 20000);
+	iHandle = llListen(iChannel,"","","");
+	TimerEvent(30.0);
+	MENU = TRUE;
 }
 
 // make a text box
 makeText(string Param)
-{ 
-    menu();
-    llTextBox(kUserKey, Param, iChannel);
+{
+	menu();
+	llTextBox(kUserKey, Param, iChannel);
 }
 
 // top level menu
 makeMainMenu()
 {
-    menu();
-    list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
+	menu();
+	list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
 }
 
 
@@ -1039,11 +1039,11 @@ makeMainMenu()
 // top level menu for non group/ non owners
 makeUserMenu()
 {
-    if (!allowUsers) return;
-    
-    menu();
-    list buttons = ["Start NPC","Stop NPC"];
-    llDialog(kUserKey,"Choose",buttons,iChannel);
+	if (!allowUsers) return;
+
+	menu();
+	list buttons = ["Start NPC","Stop NPC"];
+	llDialog(kUserKey,"Choose",buttons,iChannel);
 }
 
 
@@ -1051,199 +1051,199 @@ makeUserMenu()
 // programmable menu for @commands
 makeMenu(list buttons)
 {
-    menu();
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
+	menu();
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
 }
 
 
 // make one or two text boxes with prompts
 Text(string cmd, string p1, string p2)
 {
-    sCommand = cmd;
-     sParam2 = "";
-    if (llStringLength(p2))
-        sParam2 = p2;
+	sCommand = cmd;
+	sParam2 = "";
+	if (llStringLength(p2))
+		sParam2 = p2;
 
-    makeText(p1);
-} 
+	makeText(p1);
+}
 
 // Set the Avatar Present flag - if sensors are off and we are force run, there will be one present.
 ProcessSensor()
 {
-    integer SensorOn;
-    if ("on" == KeyValueGet("se"))
-    {
-        SensorOn = TRUE;        // we need to scan for avatars
-    } else {
-        SensorOn = FALSE;        // we need to scan for avatars
-    }
-    DEBUG("Sensor:" + (string) SensorOn);
-    
-    integer n = SenseAvatar();
-    
-    DEBUG("Avatars:" + (string) n);
-    if (SensorOn && n)
-        avatarPresent = TRUE;   // someone is here and we need to tell the system to run
-    else if (SensorOn && !n)
-        avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
-    else {       // sensor is off, lete see if there is a NPC. If so, we are ON 
-       // DEBUG("NPCEnabled:" + (string) NPCEnabled);
-       
-        if (NPCEnabled)
-            avatarPresent = TRUE;  
-        else
-            avatarPresent = FALSE;   
-    }
-    
-    //  start up from when when no one is near
-    if (avatarPresent && STATE == NobodyHome)
-        STATE = NULL;
-    
-    DEBUG("Avatar Present: " + (string) avatarPresent);
+	integer SensorOn;
+	if ("on" == KeyValueGet("se"))
+	{
+		SensorOn = TRUE;        // we need to scan for avatars
+	} else {
+			SensorOn = FALSE;        // we need to scan for avatars
+	}
+	DEBUG("Sensor:" + (string) SensorOn);
+
+	integer n = SenseAvatar();
+
+	DEBUG("Avatars:" + (string) n);
+	if (SensorOn && n)
+		avatarPresent = TRUE;   // someone is here and we need to tell the system to run
+	else if (SensorOn && !n)
+		avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
+	else {       // sensor is off, lete see if there is a NPC. If so, we are ON
+		// DEBUG("NPCEnabled:" + (string) NPCEnabled);
+
+		if (NPCEnabled)
+			avatarPresent = TRUE;
+		else
+			avatarPresent = FALSE;
+	}
+
+	//  start up from when when no one is near
+	if (avatarPresent && STATE == NobodyHome)
+		STATE = NULL;
+
+	DEBUG("Avatar Present: " + (string) avatarPresent);
 }
 
 vector CirclePoint(float radius) {
-    float x = llFrand(radius *2) - radius;        // +/- radius, randomized
-    float y = llFrand(radius *2) - radius;        // +/- radius, randomized
-    return <x, y, 0>;        // so this should always happen
+	float x = llFrand(radius *2) - radius;        // +/- radius, randomized
+	float y = llFrand(radius *2) - radius;        // +/- radius, randomized
+	return <x, y, 0>;        // so this should always happen
 }
 
 string KeyValueGet(string var) {
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k != var) jump continue;
-        //DEBUG("got " + var + " = " +  llList2String(data, 1));
-        return llList2String(data, 1);
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    return "";
-} 
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k != var) jump continue;
+		//DEBUG("got " + var + " = " +  llList2String(data, 1));
+		return llList2String(data, 1);
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	return "";
+}
 
 KeyValueSet(string var, string val) {
 
-    //DEBUG("set " + var + " = " + val);
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    if(llGetListLength(dVars) == 0)
-    {
-        llSetObjectDesc(var + "=" + val);
-        return;
-    }
-    list result = [];
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k == "") jump continue;
-        if(k == var && val == "") jump continue;
-        if(k == var) {
-            result += k + "=" + val;
-            val = "";
-            jump continue;
-        }
-        string v = llList2String(data, 1);
-        if(v == "") jump continue;
-        result += k + "=" + v;
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    if(val != "") result += var + "=" + val;
-    llSetObjectDesc(llDumpList2String(result, "&"));
+	//DEBUG("set " + var + " = " + val);
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	if(llGetListLength(dVars) == 0)
+	{
+		llSetObjectDesc(var + "=" + val);
+		return;
+	}
+	list result = [];
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k == "") jump continue;
+		if(k == var && val == "") jump continue;
+		if(k == var) {
+			result += k + "=" + val;
+			val = "";
+			jump continue;
+		}
+		string v = llList2String(data, 1);
+		if(v == "") jump continue;
+		result += k + "=" + v;
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	if(val != "") result += var + "=" + val;
+	llSetObjectDesc(llDumpList2String(result, "&"));
 }
 
 
 // clear RAM
 Clr() {
 
-    lCommands = [];
-    llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
-    makeMainMenu();
+	lCommands = [];
+	llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
+	makeMainMenu();
 }
 
 integer checkNoteCards()
 {
-    // Check that they have saved an Appeaance and Path notecard
-    integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
-    
-    integer i;
-    integer count;
-    for (; i < num; i++){
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
-            count++;
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
-            count++;
-    }
-    DEBUG("Checked " + (string) count + " Notecards");
-    // if we have both, run the NPC
-    return count;
+	// Check that they have saved an Appeaance and Path notecard
+	integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
+
+	integer i;
+	integer count;
+	for (; i < num; i++){
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
+			count++;
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
+			count++;
+	}
+	DEBUG("Checked " + (string) count + " Notecards");
+	// if we have both, run the NPC
+	return count;
 }
 
 Update(string SName) {
-         
-    // delete all NPC* scripts except myself
-    integer i;
-    integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
-    for (i = 0; i < j; i++) {
-        string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
-        string match = llGetSubString(targetName,0,2);
-        
-        if (match == SName && llGetScriptName() != targetName){
-                llOwnerSay("Upgrading " + targetName);
-            if (! LSLEditor){        // lets not kill the editor
-                llRemoveInventory(targetName);
-            }
-        }
-    }
+
+	// delete all NPC* scripts except myself
+	integer i;
+	integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
+	for (i = 0; i < j; i++) {
+		string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
+		string match = llGetSubString(targetName,0,2);
+
+		if (match == SName && llGetScriptName() != targetName){
+			llOwnerSay("Upgrading " + targetName);
+			if (! LSLEditor){        // lets not kill the editor
+				llRemoveInventory(targetName);
+			}
+		}
+	}
 }
 
 // Get all default saved params from the Description
 GetSwitches()
 {
-         string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
-        if (rA == "A")
-            relAbs = "Absolute";
-        else  if (rA == "R")
-            relAbs = "Relative";
-        else
-            relAbs = "Absolute";
+	string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
+	if (rA == "A")
+		relAbs = "Absolute";
+	else  if (rA == "R")
+		relAbs = "Relative";
+	else
+		relAbs = "Absolute";
 
-            
-        // reenable NPC if sensor is on.
-        if ("on" == KeyValueGet("se"))
-        {
-            NPCEnabled = TRUE;
-            mSensor  = "Sense is On";
-            ProcessSensor();       // fake 1 avatar to get it rezzed
-        } else {
-            mSensor  = "Sense is Off";
-        }
-    }
+
+	// reenable NPC if sensor is on.
+	if ("on" == KeyValueGet("se"))
+	{
+		NPCEnabled = TRUE;
+		mSensor  = "Sense is On";
+		ProcessSensor();       // fake 1 avatar to get it rezzed
+	} else {
+			mSensor  = "Sense is Off";
+	}
+}
 
 
 SaveKey(key akey)
 {
-    DEBUG("Saving Key of " + (string) akey);
-    KeyValueSet("key", akey);
-    if (akey !=  (key) KeyValueGet("key") )
-    {
-        DEBUG("Fatal error, cannot save key");
-    }
-    gNpcKey = akey;
+	DEBUG("Saving Key of " + (string) akey);
+	KeyValueSet("key", akey);
+	if (akey !=  (key) KeyValueGet("key") )
+	{
+		DEBUG("Fatal error, cannot save key");
+	}
+	gNpcKey = akey;
 }
 
 
 key NPCKey()
 {
-    key akey = gNpcKey;   // from cached copy
-    // gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
-    if (gNpcKey == NULL_KEY)
-    {
-        //DEBUG("Get DKey");
-        akey = KeyValueGet("key");    // from Description of the prim
-    }
-   // DEBUG("NPC KEY:" + (string) akey);   
-    return  akey;
+	key akey = gNpcKey;   // from cached copy
+	// gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
+	if (gNpcKey == NULL_KEY)
+	{
+		//DEBUG("Get DKey");
+		akey = KeyValueGet("key");    // from Description of the prim
+	}
+	// DEBUG("NPC KEY:" + (string) akey);
+	return  akey;
 }
 
 
@@ -1252,453 +1252,453 @@ key NPCKey()
 
 default
 {
-    changed(integer change) {
-        if(change & CHANGED_REGION_START) {
-            llResetScript();
-        }
-    }
-    
-    on_rez(integer start_param)
-    {
-        llResetScript();
-    }
+	changed(integer change) {
+		if(change & CHANGED_REGION_START) {
+			llResetScript();
+		}
+	}
 
-    state_entry() {
-        
-        llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
-        DoDelete(); // kill any NPC that is out running
-        Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
-        GetSwitches(); // Get all default saved params from the Description
+	on_rez(integer start_param)
+	{
+		llResetScript();
+	}
 
-        // 4.1 allow listeners to send us commands
-        if (allowListener)
-            llListen(link_Channel,"","","");
-        TimerEvent(TIMER);
-    } 
+	state_entry() {
+
+		llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
+		DoDelete(); // kill any NPC that is out running
+		Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
+		GetSwitches(); // Get all default saved params from the Description
+
+		// 4.1 allow listeners to send us commands
+		if (allowListener)
+			llListen(link_Channel,"","","");
+		TimerEvent(TIMER);
+	}
 
 
-    touch_start(integer n) 
-    {           // if touched, make a menu
-    
-        if (checkPerms()) {
-            if (RecordPath == STATE) {
-                makeMenu(lAtButtons); 
-            }   else {
-                makeMainMenu();
-            }
-        } else {
-            makeUserMenu();
-        }
-    }
+	touch_start(integer n)
+	{           // if touched, make a menu
 
-    // menu listener
-    listen(integer iChannel, string name, key id, string message) {
+		if (checkPerms()) {
+			if (RecordPath == STATE) {
+				makeMenu(lAtButtons);
+			}   else {
+					makeMainMenu();
+			}
+		} else {
+				makeUserMenu();
+		}
+	}
 
-        // process @commands that come in via the listener
-        if (iChannel == link_Channel)
-        {
-            ParseMsg(message);
-            return;
-        }
-        
-        if (MENU) {
-            llListenRemove(iHandle);
-            MENU = 0;       // menu is off
-            iHandle = 0;
-        }
-        
-        if (message == "Stop NPC")
-        {
-            lNpcCommandList = []; // force reload of notecard
-            NPCEnabled = FALSE;
-            if (NPCKey() != NULL_KEY){
-                Kill(sNPCName);
-            } else {
-                bNPC_STOP = TRUE;
-                makeText("Enter name of an NPC to stop");
-            }
-        }
-        else if (message == "Menu" ) {
-            makeMainMenu();
-        }
-        else if (message == "Erase RAM"){
-            Clr();
-        }
-        else if (message == "Relative"){
-            relAbs = "Absolute";
-            KeyValueSet("co","A");   // remember coordinates = A
-            Clr();
-        }
-        else if (message == "Absolute"){
-            relAbs = "Relative";
-            KeyValueSet("co","R");   // remember coordinates = R
-            Clr();
-        }
-        else if (message == "Recording"){
-            DoMenuForCommands();        // show them the recording menu
-        }
-        else if (message == "Owner Only") {
-            priPub = "Group";
-            KeyValueSet("pr","1");
+	// menu listener
+	listen(integer iChannel, string name, key id, string message) {
 
-            llOwnerSay("Group members have control");
-            makeMainMenu();
-        }
-        else if (message == "Group") {
-            priPub = "Owner Only";
-            KeyValueSet("pr","0");
-            llOwnerSay("Only you have control");
-            makeMainMenu();
-        }
-        else if (message == "Sense is On") {
-            mSensor ="Sense is Off";
-            KeyValueSet("se", "off");
-            llOwnerSay(mSensor);
-            makeMainMenu();
-        }
-        else if (message == "Sense is Off") {
-            mSensor ="Sense is On";
-            llOwnerSay(mSensor);
-            KeyValueSet("se", "on");
-            
-            NPCEnabled = TRUE;
-            
-            integer count = checkNoteCards();
-            if (count >= 2)  {
-                DEBUG("Notecards ok, DoProcessNPCLine");
-                DoProcessNPCLine();
-                return;
-            }
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
+		// process @commands that come in via the listener
+		if (iChannel == link_Channel)
+		{
+			ParseMsg(message);
+			return;
+		}
 
-            llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
-            makeMainMenu();
-        }
-        else if (message == "Appearance")  {
-            llRemoveInventory(Appearance);            // delete the notecard
-            osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard 
-            llOwnerSay("Your outfit has been saved");
-            makeMainMenu();
-        }
-        else if (message == "Save") {
-            if (llGetListLength(lCommands) == 0) {
-                llOwnerSay("Nothing recorded, you need to make a recording first");
-                makeMainMenu();
-                return;
-            }
-            DoSave();
-        }
-        else if (message == "Help"){
-            llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
-            makeMainMenu();
-        }
-        else if (message == "Start NPC")    {
-            integer count = checkNoteCards();
+		if (MENU) {
+			llListenRemove(iHandle);
+			MENU = 0;       // menu is off
+			iHandle = 0;
+		}
 
-            NPCEnabled = TRUE;
+		if (message == "Stop NPC")
+		{
+			lNpcCommandList = []; // force reload of notecard
+			NPCEnabled = FALSE;
+			if (NPCKey() != NULL_KEY){
+				Kill(sNPCName);
+			} else {
+					bNPC_STOP = TRUE;
+				makeText("Enter name of an NPC to stop");
+			}
+		}
+		else if (message == "Menu" ) {
+			makeMainMenu();
+		}
+		else if (message == "Erase RAM"){
+			Clr();
+		}
+		else if (message == "Relative"){
+			relAbs = "Absolute";
+			KeyValueSet("co","A");   // remember coordinates = A
+			Clr();
+		}
+		else if (message == "Absolute"){
+			relAbs = "Relative";
+			KeyValueSet("co","R");   // remember coordinates = R
+			Clr();
+		}
+		else if (message == "Recording"){
+			DoMenuForCommands();        // show them the recording menu
+		}
+		else if (message == "Owner Only") {
+			priPub = "Group";
+			KeyValueSet("pr","1");
 
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
-            
-            if (count >= 2) {
-                DEBUG("Notecards approved , calling DoProcessNPCLine");
-                SetStop(FALSE); // Let's run the notecard
-                DoProcessNPCLine();
-                return;
-            }
+			llOwnerSay("Group members have control");
+			makeMainMenu();
+		}
+		else if (message == "Group") {
+			priPub = "Owner Only";
+			KeyValueSet("pr","0");
+			llOwnerSay("Only you have control");
+			makeMainMenu();
+		}
+		else if (message == "Sense is On") {
+			mSensor ="Sense is Off";
+			KeyValueSet("se", "off");
+			llOwnerSay(mSensor);
+			makeMainMenu();
+		}
+		else if (message == "Sense is Off") {
+			mSensor ="Sense is On";
+			llOwnerSay(mSensor);
+			KeyValueSet("se", "on");
 
-            llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
-      
-        }
-        else if (bNPC_STOP){
-            bNPC_STOP = FALSE;
-            Kill(message);
-        }
-        else if (message == ">>"){
-            makeMenu(lMenu2);
-        }
-        else if (message == ">>>"){
-            makeMenu(lMenu3);
-        }
-        else if (message == "<<") {
-            makeMenu(lAtButtons);
-        }
-        else if (message == "<<<") {
-            makeMenu(lMenu2);
-        }
-        else if (message == "@comment"){
-            Text("# ","Enter a comment","");
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@run"){
-            lCommands += "@run=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@fly"){
-            lCommands += "@fly=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@land"){
-            lCommands += "@land=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@walk") {
-            lCommands += "@walk=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@sound"){
-            Text("@sound=","Enter a sound name or UUID to trigger","");
-        }
-        else if (message == "@randsound"){
-            lCommands += "@randsound"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@say") {
-            Text("@say=","Enter what the NPC will say","");
-        }
-        else if (message == "@whisper"){
-            Text("@whisper=","Enter what the NPC will whisper","");
-        }
-        else if (message == "@shout"){
-            Text("@shout=","Enter what the NPC will shout","");
-        }
-        else if (message == "@wander") {
-            Text("@wander=","Enter radius to wander","Enter number of wanders");
-        }
-        else if (message == "@pause") {
-            Text("@pause=","Enter time to pause","");
-        }
-        else if (message == "@rotate") {
-            Text("@rotate=","Enter degrees to rotate","");
-        }
-        else if (message == "@sit"){
-            Text("@sit=","Enter name of object to sit on","");
-        }
-        else if (message == "@teleport"){
-            lCommands += "@teleport=" + Pos() + "\n";
-            llOwnerSay("teleport to position: " + Pos());
-            makeMenu(lMenu3);
-        }
-        else if (message == "@touch"){
-            Text("@touch=","Enter name of object to touch","");
-        }
-        else if (message == "@cmd"){
-            Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
-        }
-        else if (message == "@stand"){
-            lCommands += "@stand\n";
-            llOwnerSay("Stand Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@animate"){
-            Text("@animate=","Enter animation name to play","Enter time to play the animation");
-        }
-        else if (message == "@attach"){
-            Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
-        }
-         else if (message == "@speed"){
-            Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
-        }
-               
+			NPCEnabled = TRUE;
 
-        // Save NPC name
-        else if (MakeNotecard == STATE) {
-            sNPCName = message; // in case we need to kill it.
-            
-            vector  vDest = (vector)  Pos();
+			integer count = checkNoteCards();
+			if (count >= 2)  {
+				DEBUG("Notecards ok, DoProcessNPCLine");
+				DoProcessNPCLine();
+				return;
+			}
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-            if (relAbs == "Relative")
-            {
-                vDest  -= llGetPos();    // just an offset for relative
-            }
-            sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
-            integer i;
-            integer j = llGetListLength(lCommands);
-            for (; i < j; i++){
-                // get the command to save to the notecard
-                string line = llList2String(lCommands,i);
-                if (relAbs == "Absolute") {
-                    sNotecard += line;    // add the un-modified string to the notecard
-                } else {
-                        // since we have to record absolute coords since we do not know where the box goes until they press Save,
-                        // we process the absolute to relative conversion for walks here
-                        list parts = llParseString2List(line,["="],[]); //get the @command
+			llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
+			makeMainMenu();
+		}
+		else if (message == "Appearance")  {
+			llRemoveInventory(Appearance);            // delete the notecard
+			osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard
+			llOwnerSay("Your outfit has been saved");
+			makeMainMenu();
+		}
+		else if (message == "Save") {
+			if (llGetListLength(lCommands) == 0) {
+				llOwnerSay("Nothing recorded, you need to make a recording first");
+				makeMainMenu();
+				return;
+			}
+			DoSave();
+		}
+		else if (message == "Help"){
+			llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
+			makeMainMenu();
+		}
+		else if (message == "Start NPC")    {
+			integer count = checkNoteCards();
 
-                    if (llList2String(parts,0) == "@walk") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@walk=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@fly") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@fly=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@run") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@run=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@land") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@land=" + (string) vec + "\n";
-                    }
-                    else {
-                        sNotecard += line;    // add the un-modified string to the notecard
-                    }
-                }
-            }
-            llRemoveInventory(Notecard);        // delete the old notecard
-            osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
-            llSay(0,sNotecard);
-            llOwnerSay("Commands notecard has been written");
-            STATE = NULL;
-        } // MakeNotecard
+			NPCEnabled = TRUE;
 
-        else  if (! llStringLength(sParam2)) {
-            lCommands +=  sCommand + message + "\n";
-            llOwnerSay("Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (llStringLength(sParam2)){
-            sCommand = sCommand + message + "|";
-            llOwnerSay("Recorded");
-            makeText(sParam2);
-            sParam2 = "";
-        }
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-    }
+			if (count >= 2) {
+				DEBUG("Notecards approved , calling DoProcessNPCLine");
+				SetStop(FALSE); // Let's run the notecard
+				DoProcessNPCLine();
+				return;
+			}
+
+			llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
+
+		}
+		else if (bNPC_STOP){
+			bNPC_STOP = FALSE;
+			Kill(message);
+		}
+		else if (message == ">>"){
+			makeMenu(lMenu2);
+		}
+		else if (message == ">>>"){
+			makeMenu(lMenu3);
+		}
+		else if (message == "<<") {
+			makeMenu(lAtButtons);
+		}
+		else if (message == "<<<") {
+			makeMenu(lMenu2);
+		}
+		else if (message == "@comment"){
+			Text("# ","Enter a comment","");
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@run"){
+			lCommands += "@run=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@fly"){
+			lCommands += "@fly=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@land"){
+			lCommands += "@land=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@walk") {
+			lCommands += "@walk=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@sound"){
+			Text("@sound=","Enter a sound name or UUID to trigger","");
+		}
+		else if (message == "@randsound"){
+			lCommands += "@randsound"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@say") {
+			Text("@say=","Enter what the NPC will say","");
+		}
+		else if (message == "@whisper"){
+			Text("@whisper=","Enter what the NPC will whisper","");
+		}
+		else if (message == "@shout"){
+			Text("@shout=","Enter what the NPC will shout","");
+		}
+		else if (message == "@wander") {
+			Text("@wander=","Enter radius to wander","Enter number of wanders");
+		}
+		else if (message == "@pause") {
+			Text("@pause=","Enter time to pause","");
+		}
+		else if (message == "@rotate") {
+			Text("@rotate=","Enter degrees to rotate","");
+		}
+		else if (message == "@sit"){
+			Text("@sit=","Enter name of object to sit on","");
+		}
+		else if (message == "@teleport"){
+			lCommands += "@teleport=" + Pos() + "\n";
+			llOwnerSay("teleport to position: " + Pos());
+			makeMenu(lMenu3);
+		}
+		else if (message == "@touch"){
+			Text("@touch=","Enter name of object to touch","");
+		}
+		else if (message == "@cmd"){
+			Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
+		}
+		else if (message == "@stand"){
+			lCommands += "@stand\n";
+			llOwnerSay("Stand Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@animate"){
+			Text("@animate=","Enter animation name to play","Enter time to play the animation");
+		}
+		else if (message == "@attach"){
+			Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
+		}
+		else if (message == "@speed"){
+			Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
+		}
+
+
+		// Save NPC name
+		else if (MakeNotecard == STATE) {
+			sNPCName = message; // in case we need to kill it.
+
+			vector  vDest = (vector)  Pos();
+
+			if (relAbs == "Relative")
+			{
+				vDest  -= llGetPos();    // just an offset for relative
+			}
+			sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
+			integer i;
+			integer j = llGetListLength(lCommands);
+			for (; i < j; i++){
+				// get the command to save to the notecard
+				string line = llList2String(lCommands,i);
+				if (relAbs == "Absolute") {
+					sNotecard += line;    // add the un-modified string to the notecard
+				} else {
+						// since we have to record absolute coords since we do not know where the box goes until they press Save,
+						// we process the absolute to relative conversion for walks here
+						list parts = llParseString2List(line,["="],[]); //get the @command
+
+					if (llList2String(parts,0) == "@walk") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@walk=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@fly") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@fly=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@run") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@run=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@land") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@land=" + (string) vec + "\n";
+					}
+					else {
+						sNotecard += line;    // add the un-modified string to the notecard
+					}
+				}
+			}
+			llRemoveInventory(Notecard);        // delete the old notecard
+			osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
+			llSay(0,sNotecard);
+			llOwnerSay("Commands notecard has been written");
+			STATE = NULL;
+		} // MakeNotecard
+
+		else  if (! llStringLength(sParam2)) {
+			lCommands +=  sCommand + message + "\n";
+			llOwnerSay("Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (llStringLength(sParam2)){
+			sCommand = sCommand + message + "|";
+			llOwnerSay("Recorded");
+			makeText(sParam2);
+			sParam2 = "";
+		}
+
+	}
 
 
 
-    timer(){
-       // DEBUG("tick");
-        
-        // if llDialog is up, kill the listener for the dialog box.
-        if (iHandle) {
-            llOwnerSay("Menu timed out");
-            llListenRemove(iHandle);
-            iHandle = 0;
-            return;             // ^^^^^^^^^^^^^^^^^^^^^^^
-        }
-        // if NoBodyHome, we are sensing for an avatar
-        else if (NobodyHome == STATE) {
-            ProcessSensor();
-            return;
-        }
-        // if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
-        else if (Spawning == STATE) {
-            STATE = NULL;
-            TimerEvent(TIMER);
-        }
-        // We end aniamtions with a timer
-        else if (Animate == STATE){
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-        }
-        
-        else if (Walking == STATE) {
-            if (--iWaitCounter) {
-                DEBUG("still walking...");
-                if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
-                    return;
-                }
-            }
+	timer(){
+		// DEBUG("tick");
 
-            DEBUG("At Destination: " + (string) newDest);
-            
-            // walk, fly, run, land
-            if (walkstate == 1) {
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 2)  {
-                    // nothing
-                } else if (walkstate == 3) {
-                     NPCAnimate(STAND);
-                     NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 4) {
-                llShout(FLIGHT,"landing");
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            }
-        }
-        // Wandering timer 
-        else if (Wander == STATE) {
-            if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
-                if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
-                    return;
-            }
+		// if llDialog is up, kill the listener for the dialog box.
+		if (iHandle) {
+			llOwnerSay("Menu timed out");
+			llListenRemove(iHandle);
+			iHandle = 0;
+			return;             // ^^^^^^^^^^^^^^^^^^^^^^^
+		}
+		// if NoBodyHome, we are sensing for an avatar
+		else if (NobodyHome == STATE) {
+			ProcessSensor();
+			return;
+		}
+		// if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
+		else if (Spawning == STATE) {
+			STATE = NULL;
+			TimerEvent(TIMER);
+		}
+		// We end aniamtions with a timer
+		else if (Animate == STATE){
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+		}
 
-            // see if wander counter == 0, if so, stop walking, go to stand and process next line
-            if(RAMwc == 0) {
-                NPCAnimate(STAND);
-                DEBUG("Wander ended, calling DoProcessNPCLine");
-                STATE = NULL;
-                return;
-            }
-            // one less time to wander around
-            RAMwc--;
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-            StateWanderhold();
-            return;
-        }
-        // Wandering requires us to re-wander when we reach a destination
-        else if (WanderHold == STATE) {
-            StateWander();
-            return;
-        }
-        else if (DoProcess == STATE) {
-            TimerEvent(QUICK);
-        }
+		else if (Walking == STATE) {
+			if (--iWaitCounter) {
+				DEBUG("still walking...");
+				if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
+					return;
+				}
+			}
 
-        STATE = NULL;
+			DEBUG("At Destination: " + (string) newDest);
 
-        // We always process a NPC line at end of timer.
-        DEBUG("Tick end, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-    }
+			// walk, fly, run, land
+			if (walkstate == 1) {
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 2)  {
+					// nothing
+				} else if (walkstate == 3) {
+						NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 4) {
+					llShout(FLIGHT,"landing");
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			}
+		}
+		// Wandering timer
+		else if (Wander == STATE) {
+			if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
+				if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
+					return;
+			}
 
-    // sensors are used for sitting on prims
-    // Neo Cortex: added different states to trigger sit or touch
-    sensor(integer num) {
-        if (Sit == STATE ) {
-            osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
-            DEBUG("Seated, calling DoProcessNPCLine");
-            
-            STATE = 0;
-        } else if (Touch == STATE) {
-            osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
-            DEBUG("Touched, calling DoProcessNPCLine");
-            STATE = 0;
-        }
-        DoProcessNPCLine();
-    }
-    no_sensor(){
-        DEBUG ("no target prim located, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-        STATE = NULL;
-    }
+			// see if wander counter == 0, if so, stop walking, go to stand and process next line
+			if(RAMwc == 0) {
+				NPCAnimate(STAND);
+				DEBUG("Wander ended, calling DoProcessNPCLine");
+				STATE = NULL;
+				return;
+			}
+			// one less time to wander around
+			RAMwc--;
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+			StateWanderhold();
+			return;
+		}
+		// Wandering requires us to re-wander when we reach a destination
+		else if (WanderHold == STATE) {
+			StateWander();
+			return;
+		}
+		else if (DoProcess == STATE) {
+			TimerEvent(QUICK);
+		}
+
+		STATE = NULL;
+
+		// We always process a NPC line at end of timer.
+		DEBUG("Tick end, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+	}
+
+	// sensors are used for sitting on prims
+	// Neo Cortex: added different states to trigger sit or touch
+	sensor(integer num) {
+		if (Sit == STATE ) {
+			osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
+			DEBUG("Seated, calling DoProcessNPCLine");
+
+			STATE = 0;
+		} else if (Touch == STATE) {
+				osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
+			DEBUG("Touched, calling DoProcessNPCLine");
+			STATE = 0;
+		}
+		DoProcessNPCLine();
+	}
+	no_sensor(){
+		DEBUG ("no target prim located, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+		STATE = NULL;
+	}
+
+
+	link_message(integer sender, integer num, string str, key id){
+		if (num == 0)
+			ParseMsg(str);
+	}
 
-    
-    link_message(integer sender, integer num, string str, key id){
-        if (num == 0)
-            ParseMsg(str);
-    }
-        
 }
 
 // __ END__
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.9.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.9.lsl
index f67fece9..d2268aee 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.9.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V4.9.lsl	
@@ -29,7 +29,7 @@
 // Rev 1.6 5-24-2014 move menu so you can get it by touching, removed many of the KeyValues to RAM for efficiency
 // Rev 1.7 CHANGED_REGION_START, not CHANGED_REGION_START (Opensim difference)
 // Rev 1.8 tuned up Kill NPC, added more flexible upgrader
-// Rev 1.9 Better script injection by link message// Rev 2.0 Added osSetSpeed so you can speed up or slow down an NPC. 
+// Rev 1.9 Better script injection by link message// Rev 2.0 Added osSetSpeed so you can speed up or slow down an NPC.
 // Rev 2.1 No laggy sensor used exept to sit on stuff
 // Rev 2.2 Various sensor fixes
 // Rev 2.3 Sets No Sensor in menu, must be started by hand
@@ -44,7 +44,7 @@
 // Rev 3.4 animation timer cannot be zero or it shuts off timer tweaked
 //         solves the NPC starting up when no sensor is set.
 // Rev 3.5 fixes saving to !Path  notecard
-// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted 
+// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted
 // Rev 3.7 08-11-2015 @attach command added to load an attachment from the inventory to the NPC
 // Rev 3.8 08-17-2015 process queued commands one at a time without calling ProcessNPCLine on link message
 // Rev 3.9 08-23-2011 Queued command fixes including @delete which were not always working
@@ -81,11 +81,11 @@
 // Merged with new Route recorder and notecard writer
 // If the NPC failed to reach a destination it never moved on.
 // Added WAIT global to tune this
-// Exposed many tunable variables and ported the code 
+// Exposed many tunable variables and ported the code
 // Added floating point to times in notecard.
 // Added @sound, @randsound, @whisper, @shout, and @cmd controls.
 // notecards integers are not floats for better control
-// 
+//
 // Link Messages may be used to perform external control by injecting @commands into the stream of actions
 // Example:
 // To chat something, such as with a chat robot
@@ -103,7 +103,7 @@
 //    Enabled = true
 //
 // and then the server has to be restarted.
-// please note that there are better ways to enable NPC in the latest Opensim.  
+// please note that there are better ways to enable NPC in the latest Opensim.
 
 // Commands: All commands begin with an @ sign.  All other lines are ignored
 // @commands may have optional parameters.  The syntax is always:
@@ -138,7 +138,7 @@
 //@attach     InventoryName               attachmentPoint         load an attachment from the inventory to the NPC onto point
 //@teleport   destination (vector)        NaN                     Makes the NPC teleport to destination in the same sim.  They cannot tp to another sim or across the HG
 //@reset      NaN                         NaN                     Deletes the NPC, starts the !Path notecard over.
- 
+
 // Constant            attachmentPoint Comment
 // ATTACH_CHEST            1    chest/sternum
 // ATTACH_HEAD             2    head
@@ -182,16 +182,16 @@
 // ATTACH_AVATAR_CENTER  40    avatar center/root
 
 
-  
+
 //////////////////////////////////////////////////////////
 //                  DEBUG                               //
 //////////////////////////////////////////////////////////
 integer debug = FALSE;
-         // set to TRUE or FALSE for debug chat on various actions
+// set to TRUE or FALSE for debug chat on various actions
 integer LSLEditor = FALSE;        // set to to TRUE to working in  LSLEditor, FALSE for in-world.
-                              // you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
+// you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
 integer iTitleText = FALSE;    // set to TRUE to see debug info in text above the controller
- 
+
 //////////////////////////////////////////////////////////
 //                  TUNABLE CONFIGURATION               //
 //////////////////////////////////////////////////////////
@@ -214,9 +214,9 @@ string    WALK = "Walk";       // the name of the default Walk animation
 string    FLY = "Fly";        // the name of the default Fly animation
 string    RUN = "Run";        // the name of the default Run animation
 string    LAND = "Land";      // the name of the default land animation ( for birds only)
-float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.  
+float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.
 float    SPEEDMULT =0.8;     // 1.0 = regular avatar speed. Smaller numbers slow down walks. Large numbers speed them up.
-integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing" 
+integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing"
 
 // DESCRIPTIONS FIELDS HAVE TO SURVIVE A RESET
 //  These vars are stored  by saving them with KeyValueSet
@@ -270,7 +270,7 @@ list lMenu3 = ["<<<","@notecard","@appearance", "@touch", "@speed",       "@atta
 string sCommand;  // place to store a command for two-prompted ones
 string sParam2;   // place to store a prompt for two-prompted ones
 string priPub = "Owner Only";    // Private or Group
-key kUserKey;        // the person who is controlling the avatar, not the Owner  
+key kUserKey;        // the person who is controlling the avatar, not the Owner
 // the command lists
 list lCommands;  // commands are stored here
 list lNpcCommandList; // Storage for the NPC script.
@@ -317,723 +317,723 @@ list Stack ;              // a command stack from link message input
 
 TimerEvent(float timesent)
 {
-    if (LSLEditor)
-        timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
-        
-    DEBUG("Setting  timer: " + (string) timesent);
-    llSetTimerEvent(timesent);
+	if (LSLEditor)
+		timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
+
+	DEBUG("Setting  timer: " + (string) timesent);
+	llSetTimerEvent(timesent);
 }
 
 // for 4.1 parse a message from a Listen or a Link message
 ParseMsg(string str) {
-    DEBUG("Command In:" + str);
-    if (str=="@go") {
-        SetStop(FALSE); // Let's run the notecard
-        DEBUG("@go running");
-        DoProcessNPCLine();
-    } else {
-        Stack += [str];    // take anything, the controller will filter away non @ stuff
-        if (STATE == NULL)
-            DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
-    }
+	DEBUG("Command In:" + str);
+	if (str=="@go") {
+		SetStop(FALSE); // Let's run the notecard
+		DEBUG("@go running");
+		DoProcessNPCLine();
+	} else {
+			Stack += [str];    // take anything, the controller will filter away non @ stuff
+		if (STATE == NULL)
+			DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
+	}
 }
 
 SetStop(integer what)
 {
-    DEBUG("Stopped set to " + (string ) what);
-    Stopped = what;
+	DEBUG("Stopped set to " + (string ) what);
+	Stopped = what;
 }
 // Do* functions are much like states from the old V2 scripts.
-    
+
 // Save a Path notecard
 DoSave()
-{ 
-    STATE = MakeNotecard;
-    makeText("Stand where you want the NPC to appear, and enter the NPC Name");
+{
+	STATE = MakeNotecard;
+	makeText("Stand where you want the NPC to appear, and enter the NPC Name");
 }
 
 // This function is used to record the path for the NPC
 // Each command can take 0, 1, or 2 params
 DoMenuForCommands() {
-    makeMenu(lAtButtons);
+	makeMenu(lAtButtons);
 }
 
 
 // No one is here when sensors were on, so we kill off the NPC
 DoNobodyHome()
 {
-    DEBUG("Nobody Home");
-    STATE = NobodyHome;
-    if (NPCKey() != NULL_KEY) {
-        osNpcRemove(NPCKey());
-        SaveKey(NULL_KEY);
-    }
-    TimerEvent(5);  // keep ticking to sense avatars   
+	DEBUG("Nobody Home");
+	STATE = NobodyHome;
+	if (NPCKey() != NULL_KEY) {
+		osNpcRemove(NPCKey());
+		SaveKey(NULL_KEY);
+	}
+	TimerEvent(5);  // keep ticking to sense avatars
 }
 
 
 ///////////////////////  STATELIKE BEHAVIOUR  /////////////
-// these StateXX functions need to wait on a timer to fire. 
+// these StateXX functions need to wait on a timer to fire.
 
 // Create a NPC
 StateSpawn() {
-    DEBUG("state spawn " + sNPCName);
-     
-    NPCEnabled = TRUE; //  in world
-    // see if there is already one out there.
-    if (NPCKey() != NULL_KEY) {
-        DEBUG("Already living");
-        return;
-    }
-    
-    STATE = Spawning;        
-    list name = llParseString2List(sNPCName, [" "], []);
-   
-    vector vRezPos = vInitialPos;
-    if (relAbs == "Relative"){
-        vRezPos += llGetPos();
-    }
+	DEBUG("state spawn " + sNPCName);
 
-   // llSay(0,llDumpList2String(name,",")); 
+	NPCEnabled = TRUE; //  in world
+	// see if there is already one out there.
+	if (NPCKey() != NULL_KEY) {
+		DEBUG("Already living");
+		return;
+	}
 
-    DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
-    key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+	STATE = Spawning;
+	list name = llParseString2List(sNPCName, [" "], []);
 
-    llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
-    SaveKey(aKey); // save in description and global, too
-    
-    osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
-    TimerEvent(REZTIME);
-    NPCAnimate(STAND);
+	vector vRezPos = vInitialPos;
+	if (relAbs == "Relative"){
+		vRezPos += llGetPos();
+	}
+
+	// llSay(0,llDumpList2String(name,","));
+
+	DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
+	key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+
+	llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
+	SaveKey(aKey); // save in description and global, too
+
+	osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
+	TimerEvent(REZTIME);
+	NPCAnimate(STAND);
 }
 
 StateSit() {
-    DEBUG ("state sit - looking for " + RAMsit);
-    STATE=Sit;
-    llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state sit - looking for " + RAMsit);
+	STATE=Sit;
+	llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
 
 StateTouch() {
-    DEBUG ("state touch - looking for " + RAMtouch);
-    STATE = Touch;
-    llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state touch - looking for " + RAMtouch);
+	STATE = Touch;
+	llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
- 
+
 DoStand() {
-    DEBUG("state stand");
-    osNpcStand(NPCKey());
+	DEBUG("state stand");
+	osNpcStand(NPCKey());
 }
 
 
 StateAnimate() {
-    
-    DEBUG("state animate");
-    STATE = Animate;
-    NPCAnimate(RAManimationName);
-    if (RAManimationTime <=0 )    // V 3.4 tweak
-        RAManimationTime = 1;
-    TimerEvent(RAManimationTime);
+
+	DEBUG("state animate");
+	STATE = Animate;
+	NPCAnimate(RAManimationName);
+	if (RAManimationTime <=0 )    // V 3.4 tweak
+		RAManimationTime = 1;
+	TimerEvent(RAManimationTime);
 }
-    
+
 StateWalk() {
 
-    DEBUG("Start Walk");
-    //DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
-    STATE = Walking;
-            
-    // walk, fly, run, land
-   if (walkstate == 1) {
-        NPCAnimate(WALK);
-    } else if (walkstate == 2)  {
-        llShout(FLIGHT,"flying");
-        NPCAnimate(FLY);
-    } else if (walkstate == 3) {
-        NPCAnimate(RUN);
-    } else if (walkstate == 4) {
-        NPCAnimate(LAND);
-    } 
-    newDest = vDestPos ;
-    newDest.z += OffsetZ;
-        
-    // notecard is stored as offsets from this box with relative addressing.  Convert to absolute
-    if (relAbs == "Relative"){
-        newDest += llGetPos();
-    }
+	DEBUG("Start Walk");
+	//DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
+	STATE = Walking;
 
-    DEBUG("Moveto:" + (string) newDest);
-    osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);
+	// walk, fly, run, land
+	if (walkstate == 1) {
+		NPCAnimate(WALK);
+	} else if (walkstate == 2)  {
+			llShout(FLIGHT,"flying");
+		NPCAnimate(FLY);
+	} else if (walkstate == 3) {
+			NPCAnimate(RUN);
+	} else if (walkstate == 4) {
+			NPCAnimate(LAND);
+	}
+	newDest = vDestPos ;
+	newDest.z += OffsetZ;
+
+	// notecard is stored as offsets from this box with relative addressing.  Convert to absolute
+	if (relAbs == "Relative"){
+		newDest += llGetPos();
+	}
+
+	DEBUG("Moveto:" + (string) newDest);
+	osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 
 StateWander(){
-    DEBUG("state wander");
-    STATE = Wander;
-    
-    vector point = CirclePoint(RAMwd);
-    DEBUG("CirclePoint:" + (string) point);
-    vWanderPos = vDestPos + point;
-    DEBUG("vWanderPos:" + (string) vWanderPos);
+	DEBUG("state wander");
+	STATE = Wander;
 
-    fTimerVal = WANDERTIME;    // default time to pause after each wander
-    if (WANDERRAND)
-        fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
+	vector point = CirclePoint(RAMwd);
+	DEBUG("CirclePoint:" + (string) point);
+	vWanderPos = vDestPos + point;
+	DEBUG("vWanderPos:" + (string) vWanderPos);
 
-    NPCAnimate(WALK);
+	fTimerVal = WANDERTIME;    // default time to pause after each wander
+	if (WANDERRAND)
+		fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
 
-    DEBUG("Wander to:" + (string) vWanderPos);
+	NPCAnimate(WALK);
 
-    osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);      
+	DEBUG("Wander to:" + (string) vWanderPos);
+
+	osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 StateWanderhold() {
 
-    DEBUG("Wander Hold");
-    STATE = WanderHold;
-       
-     // now that we have reached a wander spot, slow the timer down to the desired value
-    TimerEvent(fTimerVal);
+	DEBUG("Wander Hold");
+	STATE = WanderHold;
+
+	// now that we have reached a wander spot, slow the timer down to the desired value
+	TimerEvent(fTimerVal);
 }
 
 
- 
+
 DoRotate() {
-    DEBUG("@rotate=" + (string) RAMrot); 
-    osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
-}  
+	DEBUG("@rotate=" + (string) RAMrot);
+	osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
+}
 
 
 
 // @pause=10 will do nothing for 10 seconds
 DoPause() {
-    STATE = Paused;
-    if (RAMPause < 0.1)
-        RAMPause = 0.1;
-    DEBUG("@pause=" + (string)RAMPause);
-    TimerEvent(RAMPause);
+	STATE = Paused;
+	if (RAMPause < 0.1)
+		RAMPause = 0.1;
+	DEBUG("@pause=" + (string)RAMPause);
+	TimerEvent(RAMPause);
 }
 
 
 // @stop makes the NPC stop moving in whatever state it is in.  You have to linkmessage to get moving again
-DoStop() {    
-    DEBUG("NPC is Stopped");
-    STATE   = 0;    // accept commands
-    SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-    TimerEvent(0);
-    Stack = []; // v3.8
+DoStop() {
+	DEBUG("NPC is Stopped");
+	STATE   = 0;    // accept commands
+	SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+	TimerEvent(0);
+	Stack = []; // v3.8
 }
-    
+
 // @delete removes the NPC forever. Next command starts it up again at the beginning
 DoDelete() {
-    DEBUG("state delete");
-    osNpcRemove(NPCKey());
-    SaveKey(NULL_KEY);
-    TimerEvent(0);
-    Stack = []; // v3.8
-    STATE = NULL;    // accept commands
+	DEBUG("state delete");
+	osNpcRemove(NPCKey());
+	SaveKey(NULL_KEY);
+	TimerEvent(0);
+	Stack = []; // v3.8
+	STATE = NULL;    // accept commands
 }
 
 // change the appearance of the NPC
 DoAppearance(string notecard) {
-    DEBUG("state appearance");
-    if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
-        DEBUG("Load appearance " + notecard);
-        osNpcLoadAppearance(NPCKey(),notecard);
-    }
-    STATE = NULL;    // accept commands
+	DEBUG("state appearance");
+	if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
+		DEBUG("Load appearance " + notecard);
+		osNpcLoadAppearance(NPCKey(),notecard);
+	}
+	STATE = NULL;    // accept commands
 }
 
 // Change the avatar speed
 DoSpeed(string speed) {
-    float newspeed = (float) speed;
-    if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
-        osSetSpeed(NPCKey(),newspeed);
-    }
-    STATE = NULL;    // accept commands
+	float newspeed = (float) speed;
+	if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
+		osSetSpeed(NPCKey(),newspeed);
+	}
+	STATE = NULL;    // accept commands
 }
 
 DoTeleport(string params) {
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    vector Dest = (vector) itemName;
-    if (Dest != ZERO_VECTOR) {
-        if (relAbs == "Relative"){
-            Dest += llGetPos();
-        }
-        osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
-        
-    } else {
-        llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
-    }
-    STATE = NULL;    // accept commands
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	vector Dest = (vector) itemName;
+	if (Dest != ZERO_VECTOR) {
+		if (relAbs == "Relative"){
+			Dest += llGetPos();
+		}
+		osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
+
+	} else {
+			llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
+	}
+	STATE = NULL;    // accept commands
 }
 
 
 
 DoNewNote (string card) {
-    DEBUG("Load Notecard " + card);    
-    NPCReadNoteCard(card);
-    SetStop(FALSE);
-    STATE = NULL;    // accept commands
+	DEBUG("Load Notecard " + card);
+	NPCReadNoteCard(card);
+	SetStop(FALSE);
+	STATE = NULL;    // accept commands
 }
 DoAttach(string params) {
-    
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    integer attachmentPoint  = (integer) llList2String(Data, 1);
-    if (attachmentPoint > 0
-        && attachmentPoint < 40
-        && llGetInventoryType(itemName) == INVENTORY_OBJECT
-       )
-    {
-        osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
-    }
-    STATE = NULL;    // accept commands
+
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	integer attachmentPoint  = (integer) llList2String(Data, 1);
+	if (attachmentPoint > 0
+		&& attachmentPoint < 40
+			&& llGetInventoryType(itemName) == INVENTORY_OBJECT
+				)
+				{
+					osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
+				}
+	STATE = NULL;    // accept commands
 }
 
 // This loops over the notecard, processing each command
 DoProcessNPCLine() {
-    DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
-    
-    STATE = DoProcess;
-    
-        // auto load a notecard
-    if (! llGetListLength(lNpcCommandList)) {
-        DEBUG("Read Notecard");
-        NPCReadNoteCard(Notecard);
-    }
+	DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
 
-    // look for link messages on the stack
-    string next = llList2String(Stack,0);    // lets see if there is anything from a link message
-    if (llStringLength(next))
-    {
-        Stack = llDeleteSubList(Stack,0,0);
-        ProcessCmd(next);        //lets do this command instead.
-        return;
-    }
+	STATE = DoProcess;
 
-    // @stop issued?
-    if (Stopped) {
-        TimerEvent(0);
-        DEBUG("Stopped, waiting for input");
-        STATE = NULL;
-        return;
-    }
+	// auto load a notecard
+	if (! llGetListLength(lNpcCommandList)) {
+		DEBUG("Read Notecard");
+		NPCReadNoteCard(Notecard);
+	}
 
-    // No, we have an @go for liftoff
-    next = llList2String(lNpcCommandList, 0);        // get the next command
-    DEBUG("Execute:" + next);
-    lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
-        
-    if (llGetListLength(lNpcCommandList) == 0) {
-        DEBUG("EOF");
-    }
-    ProcessCmd(next);
-} 
+	// look for link messages on the stack
+	string next = llList2String(Stack,0);    // lets see if there is anything from a link message
+	if (llStringLength(next))
+	{
+		Stack = llDeleteSubList(Stack,0,0);
+		ProcessCmd(next);        //lets do this command instead.
+		return;
+	}
+
+	// @stop issued?
+	if (Stopped) {
+		TimerEvent(0);
+		DEBUG("Stopped, waiting for input");
+		STATE = NULL;
+		return;
+	}
+
+	// No, we have an @go for liftoff
+	next = llList2String(lNpcCommandList, 0);        // get the next command
+	DEBUG("Execute:" + next);
+	lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
+
+	if (llGetListLength(lNpcCommandList) == 0) {
+		DEBUG("EOF");
+	}
+	ProcessCmd(next);
+}
 
 
 
 ProcessCmd(string cmd) {
 
-    DEBUG("ProcessCmd:" + cmd);
+	DEBUG("ProcessCmd:" + cmd);
 
-    llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
-    if (llGetSubString(cmd, 0, 0) != "@") {
-        DEBUG("ignoring");
-        TimerEvent(QUICK);  // this is so we do not recurse the stack
-        STATE = NULL;
-        return;
-    }
+	llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
+	if (llGetSubString(cmd, 0, 0) != "@") {
+		DEBUG("ignoring");
+		TimerEvent(QUICK);  // this is so we do not recurse the stack
+		STATE = NULL;
+		return;
+	}
 
-    list data  = llParseString2List(cmd, ["="], []);
-    npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
+	list data  = llParseString2List(cmd, ["="], []);
+	npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
 
-    DEBUG("Action:" + npcAction);
-    npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
-    DEBUG("Params:" + npcParams);
-    
-    @commands;
+	DEBUG("Action:" + npcAction);
+	npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
+	DEBUG("Params:" + npcParams);
 
-    ProcessSensor();
-     if (! avatarPresent){
-        DoNobodyHome();
-        DEBUG("No avatar nearby");
-        STATE = NULL;
-        return;
-    }
-    
-    if(npcAction == "@spawn") {
-        DEBUG("@spawn npcParams ");
-        list spawnData = llParseString2List(npcParams, ["|"], []);
-        sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+	@commands;
 
-        vInitialPos = (vector) llList2String(spawnData, 1);        
-        DEBUG("Coords for NPC at " + (string) vInitialPos);
-        StateSpawn();
-        return;
-    }
+	ProcessSensor();
+	if (! avatarPresent){
+		DoNobodyHome();
+		DEBUG("No avatar nearby");
+		STATE = NULL;
+		return;
+	}
 
-    StateSpawn();
-    
-    if(npcAction == "@stop") {
-        DoStop();
-        STATE = NULL;
-        return;
-    }
-    else if(npcAction == "@goto") {
-        DEBUG("goto");
-        integer lastIdx = llGetListLength(lNpcCommandList)-1;
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
-        // Wind commands till goto label.
-        @wind;
-        string next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        if(next1 != npcParams) jump wind;
-        // Wind the label too.
-        next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        // Get next command.
-        list data1  = llParseString2List(next1, ["="], []);
-        npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
-        npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
-        // Reschedule.
-        jump commands;
-    }
-    else if(npcAction == "@sound") {
-        DEBUG("sound");
-        llTriggerSound(npcParams,1.0);
-    }
-    else if(npcAction == "@randsound") {
-        DEBUG("@randsound");
-        integer N = llGetInventoryNumber(INVENTORY_SOUND);
-        integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
-        string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
-        llTriggerSound(toPlay,1.0);
-    }
-    else if(npcAction == "@walk") {
-        DEBUG("@walk");
-        GetDest(npcParams);
-        walkstate = 1;//  walking
-        NPCWalkOption = OS_NPC_NO_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@fly") {
-        GetDest(npcParams);
-        walkstate = 2;//  flying
-        NPCWalkOption = OS_NPC_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@run") {
-        DEBUG("@run");
-        GetDest(npcParams);
-        walkstate = 3;//  running
-        NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@land") {
-        DEBUG("@land");
-        GetDest(npcParams);
-        walkstate = 4;//  landing
-        NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@say") {
-        DEBUG("@say " + npcParams);
-        osNpcSay(NPCKey(), 0, npcParams);
-    }
-    else if(npcAction == "@shout") {
-        DEBUG("@shout");
-        osNpcShout(NPCKey(),0, npcParams);
-    }
-    else if(npcAction == "@whisper") {
-        DEBUG("@whisper " + npcParams);
-        osNpcWhisper(NPCKey(),0, npcParams);
-    }
-    // speak a command on a channel, so you can open doors and control stuff.
-    else if(npcAction == "@cmd") {
-        DEBUG("@cmd");
-        list dataToSpeak = llParseString2List(npcParams, ["|"], []);
-        string channel = llList2String(dataToSpeak,0);
-        DEBUG("Channel:"+(string) channel);
-        integer iChannel = (integer) channel;
-        string stringToSpeak = llList2String(dataToSpeak,1);
-        llSay(iChannel, stringToSpeak);
-    }
-    // stop everything
-    else if(npcAction == "@pause") {
-        RAMPause = (float) npcParams;
-        DoPause();
-        return;
-    }
-    else if(npcAction == "@wander") {
-        list wanderData = llParseString2List(npcParams, ["|"], []);
-        RAMwd = (float) llList2String(wanderData, 0);
-        RAMwc = (integer) llList2String(wanderData, 1);
-        vDestPos = osNpcGetPos(NPCKey());        // set the wander start
-        DEBUG("Starting at " + (string) vDestPos);
-        StateWander();
-        return;
-    }
-    else if(npcAction == "@rotate") {
-        RAMrot = (float) npcParams;
-        DoRotate();
-    }
-    else if(npcAction == "@sit") {
-        RAMsit= npcParams;
-        StateSit();
-        return;
-    }
-    else if(npcAction == "@touch") {
-        RAMtouch= npcParams;
-        StateTouch();
-        return;
-    }
-    else  if(npcAction == "@stand") {
-        DoStand();
-    }
-    else if(npcAction == "@delete") {
-        DoDelete();
-        SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-        return;
-    }
-    else if(npcAction == "@animate") {
-        list animateData = llParseString2List(npcParams, ["|"], []);
-        RAManimationName = llList2String(animateData, 0);
-        RAManimationTime = (float) llList2String(animateData, 1);
-        StateAnimate();
-        return;
-    }
-    else if(npcAction == "@appearance" ){
-        DoAppearance(npcParams);
-    }
-    else if (npcAction =="@speed") {
-        DoSpeed(npcParams);
-    }
-    else if (npcAction =="@notecard") {      
-        DoNewNote(npcParams);
-        Notecard = npcParams;
-    }
-    else if (npcAction == "@attach")
-    {
-        DoAttach(npcParams);
-    }
-    else if (npcAction == "@teleport")
-    {
-        DoTeleport(npcParams);
-    }
-    else if (npcAction == "@reset")
-    {
-        DoDelete();
-        SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
-    }
+	if(npcAction == "@spawn") {
+		DEBUG("@spawn npcParams ");
+		list spawnData = llParseString2List(npcParams, ["|"], []);
+		sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
 
-    STATE = NULL;
-    TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack 
+		vInitialPos = (vector) llList2String(spawnData, 1);
+		DEBUG("Coords for NPC at " + (string) vInitialPos);
+		StateSpawn();
+		return;
+	}
+
+	StateSpawn();
+
+	if(npcAction == "@stop") {
+		DoStop();
+		STATE = NULL;
+		return;
+	}
+	else if(npcAction == "@goto") {
+		DEBUG("goto");
+		integer lastIdx = llGetListLength(lNpcCommandList)-1;
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
+		// Wind commands till goto label.
+		@wind;
+		string next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		if(next1 != npcParams) jump wind;
+		// Wind the label too.
+		next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		// Get next command.
+		list data1  = llParseString2List(next1, ["="], []);
+		npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
+		npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
+		// Reschedule.
+		jump commands;
+	}
+	else if(npcAction == "@sound") {
+		DEBUG("sound");
+		llTriggerSound(npcParams,1.0);
+	}
+	else if(npcAction == "@randsound") {
+		DEBUG("@randsound");
+		integer N = llGetInventoryNumber(INVENTORY_SOUND);
+		integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
+		string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
+		llTriggerSound(toPlay,1.0);
+	}
+	else if(npcAction == "@walk") {
+		DEBUG("@walk");
+		GetDest(npcParams);
+		walkstate = 1;//  walking
+		NPCWalkOption = OS_NPC_NO_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@fly") {
+		GetDest(npcParams);
+		walkstate = 2;//  flying
+		NPCWalkOption = OS_NPC_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@run") {
+		DEBUG("@run");
+		GetDest(npcParams);
+		walkstate = 3;//  running
+		NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@land") {
+		DEBUG("@land");
+		GetDest(npcParams);
+		walkstate = 4;//  landing
+		NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@say") {
+		DEBUG("@say " + npcParams);
+		osNpcSay(NPCKey(), 0, npcParams);
+	}
+	else if(npcAction == "@shout") {
+		DEBUG("@shout");
+		osNpcShout(NPCKey(),0, npcParams);
+	}
+	else if(npcAction == "@whisper") {
+		DEBUG("@whisper " + npcParams);
+		osNpcWhisper(NPCKey(),0, npcParams);
+	}
+	// speak a command on a channel, so you can open doors and control stuff.
+	else if(npcAction == "@cmd") {
+		DEBUG("@cmd");
+		list dataToSpeak = llParseString2List(npcParams, ["|"], []);
+		string channel = llList2String(dataToSpeak,0);
+		DEBUG("Channel:"+(string) channel);
+		integer iChannel = (integer) channel;
+		string stringToSpeak = llList2String(dataToSpeak,1);
+		llSay(iChannel, stringToSpeak);
+	}
+	// stop everything
+	else if(npcAction == "@pause") {
+		RAMPause = (float) npcParams;
+		DoPause();
+		return;
+	}
+	else if(npcAction == "@wander") {
+		list wanderData = llParseString2List(npcParams, ["|"], []);
+		RAMwd = (float) llList2String(wanderData, 0);
+		RAMwc = (integer) llList2String(wanderData, 1);
+		vDestPos = osNpcGetPos(NPCKey());        // set the wander start
+		DEBUG("Starting at " + (string) vDestPos);
+		StateWander();
+		return;
+	}
+	else if(npcAction == "@rotate") {
+		RAMrot = (float) npcParams;
+		DoRotate();
+	}
+	else if(npcAction == "@sit") {
+		RAMsit= npcParams;
+		StateSit();
+		return;
+	}
+	else if(npcAction == "@touch") {
+		RAMtouch= npcParams;
+		StateTouch();
+		return;
+	}
+	else  if(npcAction == "@stand") {
+		DoStand();
+	}
+	else if(npcAction == "@delete") {
+		DoDelete();
+		SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+		return;
+	}
+	else if(npcAction == "@animate") {
+		list animateData = llParseString2List(npcParams, ["|"], []);
+		RAManimationName = llList2String(animateData, 0);
+		RAManimationTime = (float) llList2String(animateData, 1);
+		StateAnimate();
+		return;
+	}
+	else if(npcAction == "@appearance" ){
+		DoAppearance(npcParams);
+	}
+	else if (npcAction =="@speed") {
+		DoSpeed(npcParams);
+	}
+	else if (npcAction =="@notecard") {
+		DoNewNote(npcParams);
+		Notecard = npcParams;
+	}
+	else if (npcAction == "@attach")
+	{
+		DoAttach(npcParams);
+	}
+	else if (npcAction == "@teleport")
+	{
+		DoTeleport(npcParams);
+	}
+	else if (npcAction == "@reset")
+	{
+		DoDelete();
+		SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
+	}
+
+	STATE = NULL;
+	TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack
 }
- 
+
 
 
 /////////////////// UTILITY Functions, not state-like //////////////////
 
 // DEBUG(string) will chat a string or display it as hovertext if debug == TRUE
 DEBUG(string str) {
-    if (debug && ! LSLEditor)
-        llOwnerSay( str);                    // Send the owner debug info 
-    if (debug &&  LSLEditor)
-        llSay(0, str);                    // Send to the Console in LSLEDitor 
-    if (iTitleText) {
-        llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
-    
-    }
-} 
+	if (debug && ! LSLEditor)
+		llOwnerSay( str);                    // Send the owner debug info
+	if (debug &&  LSLEditor)
+		llSay(0, str);                    // Send to the Console in LSLEDitor
+	if (iTitleText) {
+		llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
+
+	}
+}
 
 GetDest(string npcParams) {
-    list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
-    vDestPos.x = llList2Float(dest, 0);
-    vDestPos.y = llList2Float(dest, 1);
-    vDestPos.z = llList2Float(dest, 2);
+	list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
+	vDestPos.x = llList2Float(dest, 0);
+	vDestPos.y = llList2Float(dest, 1);
+	vDestPos.z = llList2Float(dest, 2);
 }
 
 NPCReadNoteCard(string Note) {
-    DEBUG("NPCReadNoteCard");             
-    lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
-}  
-  
+	DEBUG("NPCReadNoteCard");
+	lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
+}
+
 integer SenseAvatar()
 {
-    //Returns a strided list of the UUID, position, and name of each avatar in the region
-//    list avatars = llGetAgentList(AGENT_LIST_PARCEL ,[]);
-    list avatars;
-    list avatarNames = osGetAgents();
-    integer i;
-    for (i = 0 ; i < llGetListLength(avatarNames); i++)
-    {
-        string fullname = llList2String(avatarNames,i);
-        //DEBUG("Found:" + fullname);
-        list name = llParseString2List(fullname,[" "],[]);
-        
-        key aviKey =osAvatarName2Key(llList2String(name,0),llList2String(name,1));
-        avatars += aviKey;
-    }
-    
-    integer numOfAvatars = llGetListLength(avatars);
-    if (numOfAvatars == 0)
-    {
-        DEBUG("No people, no NPC's");
-        return 0;
-    }
-    DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's"); 
-        
-    integer nAvatars;
-    
-    for( i = 0;i < numOfAvatars; i++) {
-        key aviKey = llList2Key(avatars,i);
-        if (!osIsNpc(aviKey)) {
-            list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
-            vector pos = llList2Vector(detail,0);
-            float dist = llVecDist(pos, llGetPos());
-            if (dist  < RANGE)
-            {
-                nAvatars++;
-                DEBUG("In range:" + llKey2Name(aviKey));
-            } else {
-               // DEBUG("*Not in range:" + llKey2Name(aviKey));
-            }
-        } else {
-          //  DEBUG("NPC: " + llKey2Name(aviKey));
-        }
-    }
-    //DEBUG("Located " + (string) nAvatars + " avatars");
-    return nAvatars;
-} 
- 
+	//Returns a strided list of the UUID, position, and name of each avatar in the region
+	//    list avatars = llGetAgentList(AGENT_LIST_PARCEL ,[]);
+	list avatars;
+	list avatarNames = osGetAgents();
+	integer i;
+	for (i = 0 ; i < llGetListLength(avatarNames); i++)
+	{
+		string fullname = llList2String(avatarNames,i);
+		//DEBUG("Found:" + fullname);
+		list name = llParseString2List(fullname,[" "],[]);
+
+		key aviKey =osAvatarName2Key(llList2String(name,0),llList2String(name,1));
+		avatars += aviKey;
+	}
+
+	integer numOfAvatars = llGetListLength(avatars);
+	if (numOfAvatars == 0)
+	{
+		DEBUG("No people, no NPC's");
+		return 0;
+	}
+	DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's");
+
+	integer nAvatars;
+
+	for( i = 0;i < numOfAvatars; i++) {
+		key aviKey = llList2Key(avatars,i);
+		if (!osIsNpc(aviKey)) {
+			list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
+			vector pos = llList2Vector(detail,0);
+			float dist = llVecDist(pos, llGetPos());
+			if (dist  < RANGE)
+			{
+				nAvatars++;
+				DEBUG("In range:" + llKey2Name(aviKey));
+			} else {
+					// DEBUG("*Not in range:" + llKey2Name(aviKey));
+				}
+		} else {
+				//  DEBUG("NPC: " + llKey2Name(aviKey));
+			}
+	}
+	//DEBUG("Located " + (string) nAvatars + " avatars");
+	return nAvatars;
+}
+
 // return TRUE if the avatar is owner when private is set, or TRUE if the avatar is in the same group and GROUP is set.
 integer checkPerms() {
 
-    integer group = (integer) KeyValueGet("pr");
-    if (! group)
-        priPub = "Owner Only";
-    else
-        priPub = "Group";
-    
-    
-    if (llDetectedKey(0) == llGetOwner()){
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
- 
-    if ( group && llDetectedGroup(0)) {
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
-    kUserKey = llDetectedKey(0);
-    return FALSE;
+	integer group = (integer) KeyValueGet("pr");
+	if (! group)
+		priPub = "Owner Only";
+	else
+		priPub = "Group";
+
+
+	if (llDetectedKey(0) == llGetOwner()){
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+
+	if ( group && llDetectedGroup(0)) {
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+	kUserKey = llDetectedKey(0);
+	return FALSE;
 }
 
 
 
 NPCAnimate(string anim)
 {
-    DEBUG("Start Anim: " + anim);
-    if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
-        
-        if (lastANIM != anim) {
-            if(llStringLength(lastANIM)) {
-                osNpcStopAnimation(NPCKey(), lastANIM);  
-            }
-            osNpcPlayAnimation(NPCKey(), anim);
-            lastANIM = anim;
-        }            
-    } else {
-        llSay(DEBUG_CHANNEL, "No animation named " + anim);
-    }
-} 
+	DEBUG("Start Anim: " + anim);
+	if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
+
+		if (lastANIM != anim) {
+			if(llStringLength(lastANIM)) {
+				osNpcStopAnimation(NPCKey(), lastANIM);
+			}
+			osNpcPlayAnimation(NPCKey(), anim);
+			lastANIM = anim;
+		}
+	} else {
+			llSay(DEBUG_CHANNEL, "No animation named " + anim);
+	}
+}
 
 // Kill a NPC by Name
 Kill(string param)
 {
-    integer count;
-    list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\    
-    integer i;
-    integer j = llGetListLength(avatars);
-    for (i=0 ; i <= j; i+=3){
-        
-        string desired = llList2String(avatars,i+2);
-        desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
-        
-        if (desired == param){
-            vector v = llList2Vector(avatars,i+1);
-            key target = llList2Key(avatars,i);    // get the UUID of the avatar
-            osNpcRemove(target);
-            
-            llOwnerSay("Removed " + param+ " at  location " + (string) v);
-            count++;
-        }
-    }
-    
-    NPCEnabled = FALSE; // not in world
-    SaveKey(NULL_KEY );    // Rev 4.4
-    
-    if (count)
-        llOwnerSay("Removed " + (string) count + " NPC's");
-    else
-        llOwnerSay("Could not locate " + param);
+	integer count;
+	list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\
+	integer i;
+	integer j = llGetListLength(avatars);
+	for (i=0 ; i <= j; i+=3){
+
+		string desired = llList2String(avatars,i+2);
+		desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
+
+		if (desired == param){
+			vector v = llList2Vector(avatars,i+1);
+			key target = llList2Key(avatars,i);    // get the UUID of the avatar
+			osNpcRemove(target);
+
+			llOwnerSay("Removed " + param+ " at  location " + (string) v);
+			count++;
+		}
+	}
+
+	NPCEnabled = FALSE; // not in world
+	SaveKey(NULL_KEY );    // Rev 4.4
+
+	if (count)
+		llOwnerSay("Removed " + (string) count + " NPC's");
+	else
+		llOwnerSay("Could not locate " + param);
 }
 
 
 // return a String for the position we are at. Strings used as the caller wants strings
 string Pos()
 {
-    vector where = llGetPos(); // find the box position
-   
-    where.z +=    OffsetZ;  // use the ground position + an offset 
-        
-    if (LSLEditor)
-        where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
-   
-   // if attached the height will be too high by 1/2 the agent size
-    if (llGetAttached()) {
-        vector size = llGetAgentSize(llGetOwner());   
-        float Z = size.z;
-        where.z -= Z/2;  
-    }
-   
-    // DEBUG("Pos= " + (string) where);
-    return (string) where;
+	vector where = llGetPos(); // find the box position
+
+	where.z +=    OffsetZ;  // use the ground position + an offset
+
+	if (LSLEditor)
+		where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
+
+	// if attached the height will be too high by 1/2 the agent size
+	if (llGetAttached()) {
+		vector size = llGetAgentSize(llGetOwner());
+		float Z = size.z;
+		where.z -= Z/2;
+	}
+
+	// DEBUG("Pos= " + (string) where);
+	return (string) where;
 }
 
 // setup a menu with a timer for timeouts, called by all make*()
 menu()
 {
-    llListenRemove(iHandle);
-    iChannel = llCeil(llFrand(100000) + 20000);
-    iHandle = llListen(iChannel,"","","");
-    TimerEvent(30.0);
-    MENU = TRUE;
+	llListenRemove(iHandle);
+	iChannel = llCeil(llFrand(100000) + 20000);
+	iHandle = llListen(iChannel,"","","");
+	TimerEvent(30.0);
+	MENU = TRUE;
 }
 
 // make a text box
 makeText(string Param)
-{ 
-    menu();
-    llTextBox(kUserKey, Param, iChannel);
+{
+	menu();
+	llTextBox(kUserKey, Param, iChannel);
 }
 
 // top level menu
 makeMainMenu()
 {
-    menu();
-    list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
+	menu();
+	list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
 }
 
 
@@ -1041,11 +1041,11 @@ makeMainMenu()
 // top level menu for non group/ non owners
 makeUserMenu()
 {
-    if (!allowUsers) return;
-    
-    menu();
-    list buttons = ["Start NPC","Stop NPC"];
-    llDialog(kUserKey,"Choose",buttons,iChannel);
+	if (!allowUsers) return;
+
+	menu();
+	list buttons = ["Start NPC","Stop NPC"];
+	llDialog(kUserKey,"Choose",buttons,iChannel);
 }
 
 
@@ -1053,199 +1053,199 @@ makeUserMenu()
 // programmable menu for @commands
 makeMenu(list buttons)
 {
-    menu();
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
+	menu();
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
 }
 
 
 // make one or two text boxes with prompts
 Text(string cmd, string p1, string p2)
 {
-    sCommand = cmd;
-     sParam2 = "";
-    if (llStringLength(p2))
-        sParam2 = p2;
+	sCommand = cmd;
+	sParam2 = "";
+	if (llStringLength(p2))
+		sParam2 = p2;
 
-    makeText(p1);
-} 
+	makeText(p1);
+}
 
 // Set the Avatar Present flag - if sensors are off and we are force run, there will be one present.
 ProcessSensor()
 {
-    integer SensorOn;
-    if ("on" == KeyValueGet("se"))
-    {
-        SensorOn = TRUE;        // we need to scan for avatars
-    } else {
-        SensorOn = FALSE;        // we need to scan for avatars
-    }
-    DEBUG("Sensor:" + (string) SensorOn);
-    
-    integer n = SenseAvatar();
-    
-    DEBUG("Avatars:" + (string) n);
-    if (SensorOn && n)
-        avatarPresent = TRUE;   // someone is here and we need to tell the system to run
-    else if (SensorOn && !n)
-        avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
-    else {       // sensor is off, lete see if there is a NPC. If so, we are ON 
-       // DEBUG("NPCEnabled:" + (string) NPCEnabled);
-       
-        if (NPCEnabled)
-            avatarPresent = TRUE;  
-        else
-            avatarPresent = FALSE;   
-    }
-    
-    //  start up from when when no one is near
-    if (avatarPresent && STATE == NobodyHome)
-        STATE = NULL;
-    
-    DEBUG("Avatar Present: " + (string) avatarPresent);
+	integer SensorOn;
+	if ("on" == KeyValueGet("se"))
+	{
+		SensorOn = TRUE;        // we need to scan for avatars
+	} else {
+			SensorOn = FALSE;        // we need to scan for avatars
+	}
+	DEBUG("Sensor:" + (string) SensorOn);
+
+	integer n = SenseAvatar();
+
+	DEBUG("Avatars:" + (string) n);
+	if (SensorOn && n)
+		avatarPresent = TRUE;   // someone is here and we need to tell the system to run
+	else if (SensorOn && !n)
+		avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
+	else {       // sensor is off, lete see if there is a NPC. If so, we are ON
+		// DEBUG("NPCEnabled:" + (string) NPCEnabled);
+
+		if (NPCEnabled)
+			avatarPresent = TRUE;
+		else
+			avatarPresent = FALSE;
+	}
+
+	//  start up from when when no one is near
+	if (avatarPresent && STATE == NobodyHome)
+		STATE = NULL;
+
+	DEBUG("Avatar Present: " + (string) avatarPresent);
 }
 
 vector CirclePoint(float radius) {
-    float x = llFrand(radius *2) - radius;        // +/- radius, randomized
-    float y = llFrand(radius *2) - radius;        // +/- radius, randomized
-    return <x, y, 0>;        // so this should always happen
+	float x = llFrand(radius *2) - radius;        // +/- radius, randomized
+	float y = llFrand(radius *2) - radius;        // +/- radius, randomized
+	return <x, y, 0>;        // so this should always happen
 }
 
 string KeyValueGet(string var) {
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k != var) jump continue;
-        //DEBUG("got " + var + " = " +  llList2String(data, 1));
-        return llList2String(data, 1);
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    return "";
-} 
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k != var) jump continue;
+		//DEBUG("got " + var + " = " +  llList2String(data, 1));
+		return llList2String(data, 1);
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	return "";
+}
 
 KeyValueSet(string var, string val) {
 
-    //DEBUG("set " + var + " = " + val);
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    if(llGetListLength(dVars) == 0)
-    {
-        llSetObjectDesc(var + "=" + val);
-        return;
-    }
-    list result = [];
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k == "") jump continue;
-        if(k == var && val == "") jump continue;
-        if(k == var) {
-            result += k + "=" + val;
-            val = "";
-            jump continue;
-        }
-        string v = llList2String(data, 1);
-        if(v == "") jump continue;
-        result += k + "=" + v;
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    if(val != "") result += var + "=" + val;
-    llSetObjectDesc(llDumpList2String(result, "&"));
+	//DEBUG("set " + var + " = " + val);
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	if(llGetListLength(dVars) == 0)
+	{
+		llSetObjectDesc(var + "=" + val);
+		return;
+	}
+	list result = [];
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k == "") jump continue;
+		if(k == var && val == "") jump continue;
+		if(k == var) {
+			result += k + "=" + val;
+			val = "";
+			jump continue;
+		}
+		string v = llList2String(data, 1);
+		if(v == "") jump continue;
+		result += k + "=" + v;
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	if(val != "") result += var + "=" + val;
+	llSetObjectDesc(llDumpList2String(result, "&"));
 }
 
 
 // clear RAM
 Clr() {
 
-    lCommands = [];
-    llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
-    makeMainMenu();
+	lCommands = [];
+	llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
+	makeMainMenu();
 }
 
 integer checkNoteCards()
 {
-    // Check that they have saved an Appeaance and Path notecard
-    integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
-    
-    integer i;
-    integer count;
-    for (; i < num; i++){
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
-            count++;
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
-            count++;
-    }
-    DEBUG("Checked " + (string) count + " Notecards");
-    // if we have both, run the NPC
-    return count;
+	// Check that they have saved an Appeaance and Path notecard
+	integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
+
+	integer i;
+	integer count;
+	for (; i < num; i++){
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
+			count++;
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
+			count++;
+	}
+	DEBUG("Checked " + (string) count + " Notecards");
+	// if we have both, run the NPC
+	return count;
 }
 
 Update(string SName) {
-         
-    // delete all NPC* scripts except myself
-    integer i;
-    integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
-    for (i = 0; i < j; i++) {
-        string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
-        string match = llGetSubString(targetName,0,2);
-        
-        if (match == SName && llGetScriptName() != targetName){
-                llOwnerSay("Upgrading " + targetName);
-            if (! LSLEditor){        // lets not kill the editor
-                llRemoveInventory(targetName);
-            }
-        }
-    }
+
+	// delete all NPC* scripts except myself
+	integer i;
+	integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
+	for (i = 0; i < j; i++) {
+		string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
+		string match = llGetSubString(targetName,0,2);
+
+		if (match == SName && llGetScriptName() != targetName){
+			llOwnerSay("Upgrading " + targetName);
+			if (! LSLEditor){        // lets not kill the editor
+				llRemoveInventory(targetName);
+			}
+		}
+	}
 }
 
 // Get all default saved params from the Description
 GetSwitches()
 {
-         string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
-        if (rA == "A")
-            relAbs = "Absolute";
-        else  if (rA == "R")
-            relAbs = "Relative";
-        else
-            relAbs = "Absolute";
+	string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
+	if (rA == "A")
+		relAbs = "Absolute";
+	else  if (rA == "R")
+		relAbs = "Relative";
+	else
+		relAbs = "Absolute";
 
-            
-        // reenable NPC if sensor is on.
-        if ("on" == KeyValueGet("se"))
-        {
-            NPCEnabled = TRUE;
-            mSensor  = "Sense is On";
-            ProcessSensor();       // fake 1 avatar to get it rezzed
-        } else {
-            mSensor  = "Sense is Off";
-        }
-    }
+
+	// reenable NPC if sensor is on.
+	if ("on" == KeyValueGet("se"))
+	{
+		NPCEnabled = TRUE;
+		mSensor  = "Sense is On";
+		ProcessSensor();       // fake 1 avatar to get it rezzed
+	} else {
+			mSensor  = "Sense is Off";
+	}
+}
 
 
 SaveKey(key akey)
 {
-    DEBUG("Saving Key of " + (string) akey);
-    KeyValueSet("key", akey);
-    if (akey !=  (key) KeyValueGet("key") )
-    {
-        DEBUG("Fatal error, cannot save key");
-    }
-    gNpcKey = akey;
+	DEBUG("Saving Key of " + (string) akey);
+	KeyValueSet("key", akey);
+	if (akey !=  (key) KeyValueGet("key") )
+	{
+		DEBUG("Fatal error, cannot save key");
+	}
+	gNpcKey = akey;
 }
 
 
 key NPCKey()
 {
-    key akey = gNpcKey;   // from cached copy
-    // gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
-    if (gNpcKey == NULL_KEY)
-    {
-        //DEBUG("Get DKey");
-        akey = KeyValueGet("key");    // from Description of the prim
-    }
-   // DEBUG("NPC KEY:" + (string) akey);   
-    return  akey;
+	key akey = gNpcKey;   // from cached copy
+	// gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
+	if (gNpcKey == NULL_KEY)
+	{
+		//DEBUG("Get DKey");
+		akey = KeyValueGet("key");    // from Description of the prim
+	}
+	// DEBUG("NPC KEY:" + (string) akey);
+	return  akey;
 }
 
 
@@ -1254,453 +1254,453 @@ key NPCKey()
 
 default
 {
-    changed(integer change) {
-        if(change & CHANGED_REGION_START) {
-            llResetScript();
-        }
-    }
-    
-    on_rez(integer start_param)
-    {
-        llResetScript();
-    }
+	changed(integer change) {
+		if(change & CHANGED_REGION_START) {
+			llResetScript();
+		}
+	}
 
-    state_entry() {
-        
-        llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
-        DoDelete(); // kill any NPC that is out running
-        Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
-        GetSwitches(); // Get all default saved params from the Description
+	on_rez(integer start_param)
+	{
+		llResetScript();
+	}
 
-        // 4.1 allow listeners to send us commands
-        if (allowListener)
-            llListen(link_Channel,"","","");
-        TimerEvent(TIMER);
-    } 
+	state_entry() {
+
+		llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
+		DoDelete(); // kill any NPC that is out running
+		Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
+		GetSwitches(); // Get all default saved params from the Description
+
+		// 4.1 allow listeners to send us commands
+		if (allowListener)
+			llListen(link_Channel,"","","");
+		TimerEvent(TIMER);
+	}
 
 
-    touch_start(integer n) 
-    {           // if touched, make a menu
-    
-        if (checkPerms()) {
-            if (RecordPath == STATE) {
-                makeMenu(lAtButtons); 
-            }   else {
-                makeMainMenu();
-            }
-        } else {
-            makeUserMenu();
-        }
-    }
+	touch_start(integer n)
+	{           // if touched, make a menu
 
-    // menu listener
-    listen(integer iChannel, string name, key id, string message) {
+		if (checkPerms()) {
+			if (RecordPath == STATE) {
+				makeMenu(lAtButtons);
+			}   else {
+					makeMainMenu();
+			}
+		} else {
+				makeUserMenu();
+		}
+	}
 
-        // process @commands that come in via the listener
-        if (iChannel == link_Channel)
-        {
-            ParseMsg(message);
-            return;
-        }
-        
-        if (MENU) {
-            llListenRemove(iHandle);
-            MENU = 0;       // menu is off
-            iHandle = 0;
-        }
-        
-        if (message == "Stop NPC")
-        {
-            lNpcCommandList = []; // force reload of notecard
-            NPCEnabled = FALSE;
-            if (NPCKey() != NULL_KEY){
-                Kill(sNPCName);
-            } else {
-                bNPC_STOP = TRUE;
-                makeText("Enter name of an NPC to stop");
-            }
-        }
-        else if (message == "Menu" ) {
-            makeMainMenu();
-        }
-        else if (message == "Erase RAM"){
-            Clr();
-        }
-        else if (message == "Relative"){
-            relAbs = "Absolute";
-            KeyValueSet("co","A");   // remember coordinates = A
-            Clr();
-        }
-        else if (message == "Absolute"){
-            relAbs = "Relative";
-            KeyValueSet("co","R");   // remember coordinates = R
-            Clr();
-        }
-        else if (message == "Recording"){
-            DoMenuForCommands();        // show them the recording menu
-        }
-        else if (message == "Owner Only") {
-            priPub = "Group";
-            KeyValueSet("pr","1");
+	// menu listener
+	listen(integer iChannel, string name, key id, string message) {
 
-            llOwnerSay("Group members have control");
-            makeMainMenu();
-        }
-        else if (message == "Group") {
-            priPub = "Owner Only";
-            KeyValueSet("pr","0");
-            llOwnerSay("Only you have control");
-            makeMainMenu();
-        }
-        else if (message == "Sense is On") {
-            mSensor ="Sense is Off";
-            KeyValueSet("se", "off");
-            llOwnerSay(mSensor);
-            makeMainMenu();
-        }
-        else if (message == "Sense is Off") {
-            mSensor ="Sense is On";
-            llOwnerSay(mSensor);
-            KeyValueSet("se", "on");
-            
-            NPCEnabled = TRUE;
-            
-            integer count = checkNoteCards();
-            if (count >= 2)  {
-                DEBUG("Notecards ok, DoProcessNPCLine");
-                DoProcessNPCLine();
-                return;
-            }
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
+		// process @commands that come in via the listener
+		if (iChannel == link_Channel)
+		{
+			ParseMsg(message);
+			return;
+		}
 
-            llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
-            makeMainMenu();
-        }
-        else if (message == "Appearance")  {
-            llRemoveInventory(Appearance);            // delete the notecard
-            osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard 
-            llOwnerSay("Your outfit has been saved");
-            makeMainMenu();
-        }
-        else if (message == "Save") {
-            if (llGetListLength(lCommands) == 0) {
-                llOwnerSay("Nothing recorded, you need to make a recording first");
-                makeMainMenu();
-                return;
-            }
-            DoSave();
-        }
-        else if (message == "Help"){
-            llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
-            makeMainMenu();
-        }
-        else if (message == "Start NPC")    {
-            integer count = checkNoteCards();
+		if (MENU) {
+			llListenRemove(iHandle);
+			MENU = 0;       // menu is off
+			iHandle = 0;
+		}
 
-            NPCEnabled = TRUE;
+		if (message == "Stop NPC")
+		{
+			lNpcCommandList = []; // force reload of notecard
+			NPCEnabled = FALSE;
+			if (NPCKey() != NULL_KEY){
+				Kill(sNPCName);
+			} else {
+					bNPC_STOP = TRUE;
+				makeText("Enter name of an NPC to stop");
+			}
+		}
+		else if (message == "Menu" ) {
+			makeMainMenu();
+		}
+		else if (message == "Erase RAM"){
+			Clr();
+		}
+		else if (message == "Relative"){
+			relAbs = "Absolute";
+			KeyValueSet("co","A");   // remember coordinates = A
+			Clr();
+		}
+		else if (message == "Absolute"){
+			relAbs = "Relative";
+			KeyValueSet("co","R");   // remember coordinates = R
+			Clr();
+		}
+		else if (message == "Recording"){
+			DoMenuForCommands();        // show them the recording menu
+		}
+		else if (message == "Owner Only") {
+			priPub = "Group";
+			KeyValueSet("pr","1");
 
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
-            
-            if (count >= 2) {
-                DEBUG("Notecards approved , calling DoProcessNPCLine");
-                SetStop(FALSE); // Let's run the notecard
-                DoProcessNPCLine();
-                return;
-            }
+			llOwnerSay("Group members have control");
+			makeMainMenu();
+		}
+		else if (message == "Group") {
+			priPub = "Owner Only";
+			KeyValueSet("pr","0");
+			llOwnerSay("Only you have control");
+			makeMainMenu();
+		}
+		else if (message == "Sense is On") {
+			mSensor ="Sense is Off";
+			KeyValueSet("se", "off");
+			llOwnerSay(mSensor);
+			makeMainMenu();
+		}
+		else if (message == "Sense is Off") {
+			mSensor ="Sense is On";
+			llOwnerSay(mSensor);
+			KeyValueSet("se", "on");
 
-            llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
-      
-        }
-        else if (bNPC_STOP){
-            bNPC_STOP = FALSE;
-            Kill(message);
-        }
-        else if (message == ">>"){
-            makeMenu(lMenu2);
-        }
-        else if (message == ">>>"){
-            makeMenu(lMenu3);
-        }
-        else if (message == "<<") {
-            makeMenu(lAtButtons);
-        }
-        else if (message == "<<<") {
-            makeMenu(lMenu2);
-        }
-        else if (message == "@comment"){
-            Text("# ","Enter a comment","");
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@run"){
-            lCommands += "@run=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@fly"){
-            lCommands += "@fly=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@land"){
-            lCommands += "@land=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@walk") {
-            lCommands += "@walk=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@sound"){
-            Text("@sound=","Enter a sound name or UUID to trigger","");
-        }
-        else if (message == "@randsound"){
-            lCommands += "@randsound"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@say") {
-            Text("@say=","Enter what the NPC will say","");
-        }
-        else if (message == "@whisper"){
-            Text("@whisper=","Enter what the NPC will whisper","");
-        }
-        else if (message == "@shout"){
-            Text("@shout=","Enter what the NPC will shout","");
-        }
-        else if (message == "@wander") {
-            Text("@wander=","Enter radius to wander","Enter number of wanders");
-        }
-        else if (message == "@pause") {
-            Text("@pause=","Enter time to pause","");
-        }
-        else if (message == "@rotate") {
-            Text("@rotate=","Enter degrees to rotate","");
-        }
-        else if (message == "@sit"){
-            Text("@sit=","Enter name of object to sit on","");
-        }
-        else if (message == "@teleport"){
-            lCommands += "@teleport=" + Pos() + "\n";
-            llOwnerSay("teleport to position: " + Pos());
-            makeMenu(lMenu3);
-        }
-        else if (message == "@touch"){
-            Text("@touch=","Enter name of object to touch","");
-        }
-        else if (message == "@cmd"){
-            Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
-        }
-        else if (message == "@stand"){
-            lCommands += "@stand\n";
-            llOwnerSay("Stand Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@animate"){
-            Text("@animate=","Enter animation name to play","Enter time to play the animation");
-        }
-        else if (message == "@attach"){
-            Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
-        }
-         else if (message == "@speed"){
-            Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
-        }
-               
+			NPCEnabled = TRUE;
 
-        // Save NPC name
-        else if (MakeNotecard == STATE) {
-            sNPCName = message; // in case we need to kill it.
-            
-            vector  vDest = (vector)  Pos();
+			integer count = checkNoteCards();
+			if (count >= 2)  {
+				DEBUG("Notecards ok, DoProcessNPCLine");
+				DoProcessNPCLine();
+				return;
+			}
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-            if (relAbs == "Relative")
-            {
-                vDest  -= llGetPos();    // just an offset for relative
-            }
-            sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
-            integer i;
-            integer j = llGetListLength(lCommands);
-            for (; i < j; i++){
-                // get the command to save to the notecard
-                string line = llList2String(lCommands,i);
-                if (relAbs == "Absolute") {
-                    sNotecard += line;    // add the un-modified string to the notecard
-                } else {
-                        // since we have to record absolute coords since we do not know where the box goes until they press Save,
-                        // we process the absolute to relative conversion for walks here
-                        list parts = llParseString2List(line,["="],[]); //get the @command
+			llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
+			makeMainMenu();
+		}
+		else if (message == "Appearance")  {
+			llRemoveInventory(Appearance);            // delete the notecard
+			osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard
+			llOwnerSay("Your outfit has been saved");
+			makeMainMenu();
+		}
+		else if (message == "Save") {
+			if (llGetListLength(lCommands) == 0) {
+				llOwnerSay("Nothing recorded, you need to make a recording first");
+				makeMainMenu();
+				return;
+			}
+			DoSave();
+		}
+		else if (message == "Help"){
+			llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
+			makeMainMenu();
+		}
+		else if (message == "Start NPC")    {
+			integer count = checkNoteCards();
 
-                    if (llList2String(parts,0) == "@walk") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@walk=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@fly") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@fly=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@run") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@run=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@land") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@land=" + (string) vec + "\n";
-                    }
-                    else {
-                        sNotecard += line;    // add the un-modified string to the notecard
-                    }
-                }
-            }
-            llRemoveInventory(Notecard);        // delete the old notecard
-            osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
-            llSay(0,sNotecard);
-            llOwnerSay("Commands notecard has been written");
-            STATE = NULL;
-        } // MakeNotecard
+			NPCEnabled = TRUE;
 
-        else  if (! llStringLength(sParam2)) {
-            lCommands +=  sCommand + message + "\n";
-            llOwnerSay("Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (llStringLength(sParam2)){
-            sCommand = sCommand + message + "|";
-            llOwnerSay("Recorded");
-            makeText(sParam2);
-            sParam2 = "";
-        }
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-    }
+			if (count >= 2) {
+				DEBUG("Notecards approved , calling DoProcessNPCLine");
+				SetStop(FALSE); // Let's run the notecard
+				DoProcessNPCLine();
+				return;
+			}
+
+			llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
+
+		}
+		else if (bNPC_STOP){
+			bNPC_STOP = FALSE;
+			Kill(message);
+		}
+		else if (message == ">>"){
+			makeMenu(lMenu2);
+		}
+		else if (message == ">>>"){
+			makeMenu(lMenu3);
+		}
+		else if (message == "<<") {
+			makeMenu(lAtButtons);
+		}
+		else if (message == "<<<") {
+			makeMenu(lMenu2);
+		}
+		else if (message == "@comment"){
+			Text("# ","Enter a comment","");
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@run"){
+			lCommands += "@run=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@fly"){
+			lCommands += "@fly=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@land"){
+			lCommands += "@land=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@walk") {
+			lCommands += "@walk=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@sound"){
+			Text("@sound=","Enter a sound name or UUID to trigger","");
+		}
+		else if (message == "@randsound"){
+			lCommands += "@randsound"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@say") {
+			Text("@say=","Enter what the NPC will say","");
+		}
+		else if (message == "@whisper"){
+			Text("@whisper=","Enter what the NPC will whisper","");
+		}
+		else if (message == "@shout"){
+			Text("@shout=","Enter what the NPC will shout","");
+		}
+		else if (message == "@wander") {
+			Text("@wander=","Enter radius to wander","Enter number of wanders");
+		}
+		else if (message == "@pause") {
+			Text("@pause=","Enter time to pause","");
+		}
+		else if (message == "@rotate") {
+			Text("@rotate=","Enter degrees to rotate","");
+		}
+		else if (message == "@sit"){
+			Text("@sit=","Enter name of object to sit on","");
+		}
+		else if (message == "@teleport"){
+			lCommands += "@teleport=" + Pos() + "\n";
+			llOwnerSay("teleport to position: " + Pos());
+			makeMenu(lMenu3);
+		}
+		else if (message == "@touch"){
+			Text("@touch=","Enter name of object to touch","");
+		}
+		else if (message == "@cmd"){
+			Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
+		}
+		else if (message == "@stand"){
+			lCommands += "@stand\n";
+			llOwnerSay("Stand Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@animate"){
+			Text("@animate=","Enter animation name to play","Enter time to play the animation");
+		}
+		else if (message == "@attach"){
+			Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
+		}
+		else if (message == "@speed"){
+			Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
+		}
+
+
+		// Save NPC name
+		else if (MakeNotecard == STATE) {
+			sNPCName = message; // in case we need to kill it.
+
+			vector  vDest = (vector)  Pos();
+
+			if (relAbs == "Relative")
+			{
+				vDest  -= llGetPos();    // just an offset for relative
+			}
+			sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
+			integer i;
+			integer j = llGetListLength(lCommands);
+			for (; i < j; i++){
+				// get the command to save to the notecard
+				string line = llList2String(lCommands,i);
+				if (relAbs == "Absolute") {
+					sNotecard += line;    // add the un-modified string to the notecard
+				} else {
+						// since we have to record absolute coords since we do not know where the box goes until they press Save,
+						// we process the absolute to relative conversion for walks here
+						list parts = llParseString2List(line,["="],[]); //get the @command
+
+					if (llList2String(parts,0) == "@walk") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@walk=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@fly") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@fly=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@run") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@run=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@land") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@land=" + (string) vec + "\n";
+					}
+					else {
+						sNotecard += line;    // add the un-modified string to the notecard
+					}
+				}
+			}
+			llRemoveInventory(Notecard);        // delete the old notecard
+			osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
+			llSay(0,sNotecard);
+			llOwnerSay("Commands notecard has been written");
+			STATE = NULL;
+		} // MakeNotecard
+
+		else  if (! llStringLength(sParam2)) {
+			lCommands +=  sCommand + message + "\n";
+			llOwnerSay("Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (llStringLength(sParam2)){
+			sCommand = sCommand + message + "|";
+			llOwnerSay("Recorded");
+			makeText(sParam2);
+			sParam2 = "";
+		}
+
+	}
 
 
 
-    timer(){
-       // DEBUG("tick");
-        
-        // if llDialog is up, kill the listener for the dialog box.
-        if (iHandle) {
-            llOwnerSay("Menu timed out");
-            llListenRemove(iHandle);
-            iHandle = 0;
-            return;             // ^^^^^^^^^^^^^^^^^^^^^^^
-        }
-        // if NoBodyHome, we are sensing for an avatar
-        else if (NobodyHome == STATE) {
-            ProcessSensor();
-            return;
-        }
-        // if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
-        else if (Spawning == STATE) {
-            STATE = NULL;
-            TimerEvent(TIMER);
-        }
-        // We end aniamtions with a timer
-        else if (Animate == STATE){
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-        }
-        
-        else if (Walking == STATE) {
-            if (--iWaitCounter) {
-                DEBUG("still walking...");
-                if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
-                    return;
-                }
-            }
+	timer(){
+		// DEBUG("tick");
 
-            DEBUG("At Destination: " + (string) newDest);
-            
-            // walk, fly, run, land
-            if (walkstate == 1) {
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 2)  {
-                    // nothing
-                } else if (walkstate == 3) {
-                     NPCAnimate(STAND);
-                     NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 4) {
-                llShout(FLIGHT,"landing");
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            }
-        }
-        // Wandering timer 
-        else if (Wander == STATE) {
-            if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
-                if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
-                    return;
-            }
+		// if llDialog is up, kill the listener for the dialog box.
+		if (iHandle) {
+			llOwnerSay("Menu timed out");
+			llListenRemove(iHandle);
+			iHandle = 0;
+			return;             // ^^^^^^^^^^^^^^^^^^^^^^^
+		}
+		// if NoBodyHome, we are sensing for an avatar
+		else if (NobodyHome == STATE) {
+			ProcessSensor();
+			return;
+		}
+		// if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
+		else if (Spawning == STATE) {
+			STATE = NULL;
+			TimerEvent(TIMER);
+		}
+		// We end aniamtions with a timer
+		else if (Animate == STATE){
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+		}
 
-            // see if wander counter == 0, if so, stop walking, go to stand and process next line
-            if(RAMwc == 0) {
-                NPCAnimate(STAND);
-                DEBUG("Wander ended, calling DoProcessNPCLine");
-                STATE = NULL;
-                return;
-            }
-            // one less time to wander around
-            RAMwc--;
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-            StateWanderhold();
-            return;
-        }
-        // Wandering requires us to re-wander when we reach a destination
-        else if (WanderHold == STATE) {
-            StateWander();
-            return;
-        }
-        else if (DoProcess == STATE) {
-            TimerEvent(QUICK);
-        }
+		else if (Walking == STATE) {
+			if (--iWaitCounter) {
+				DEBUG("still walking...");
+				if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
+					return;
+				}
+			}
 
-        STATE = NULL;
+			DEBUG("At Destination: " + (string) newDest);
 
-        // We always process a NPC line at end of timer.
-        DEBUG("Tick end, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-    }
+			// walk, fly, run, land
+			if (walkstate == 1) {
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 2)  {
+					// nothing
+				} else if (walkstate == 3) {
+						NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 4) {
+					llShout(FLIGHT,"landing");
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			}
+		}
+		// Wandering timer
+		else if (Wander == STATE) {
+			if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
+				if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
+					return;
+			}
 
-    // sensors are used for sitting on prims
-    // Neo Cortex: added different states to trigger sit or touch
-    sensor(integer num) {
-        if (Sit == STATE ) {
-            osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
-            DEBUG("Seated, calling DoProcessNPCLine");
-            
-            STATE = 0;
-        } else if (Touch == STATE) {
-            osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
-            DEBUG("Touched, calling DoProcessNPCLine");
-            STATE = 0;
-        }
-        DoProcessNPCLine();
-    }
-    no_sensor(){
-        DEBUG ("no target prim located, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-        STATE = NULL;
-    }
+			// see if wander counter == 0, if so, stop walking, go to stand and process next line
+			if(RAMwc == 0) {
+				NPCAnimate(STAND);
+				DEBUG("Wander ended, calling DoProcessNPCLine");
+				STATE = NULL;
+				return;
+			}
+			// one less time to wander around
+			RAMwc--;
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+			StateWanderhold();
+			return;
+		}
+		// Wandering requires us to re-wander when we reach a destination
+		else if (WanderHold == STATE) {
+			StateWander();
+			return;
+		}
+		else if (DoProcess == STATE) {
+			TimerEvent(QUICK);
+		}
+
+		STATE = NULL;
+
+		// We always process a NPC line at end of timer.
+		DEBUG("Tick end, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+	}
+
+	// sensors are used for sitting on prims
+	// Neo Cortex: added different states to trigger sit or touch
+	sensor(integer num) {
+		if (Sit == STATE ) {
+			osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
+			DEBUG("Seated, calling DoProcessNPCLine");
+
+			STATE = 0;
+		} else if (Touch == STATE) {
+				osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
+			DEBUG("Touched, calling DoProcessNPCLine");
+			STATE = 0;
+		}
+		DoProcessNPCLine();
+	}
+	no_sensor(){
+		DEBUG ("no target prim located, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+		STATE = NULL;
+	}
+
+
+	link_message(integer sender, integer num, string str, key id){
+		if (num == 0)
+			ParseMsg(str);
+	}
 
-    
-    link_message(integer sender, integer num, string str, key id){
-        if (num == 0)
-            ParseMsg(str);
-    }
-        
 }
 
 // __ END__
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V5.0.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V5.0.lsl
index 1250aa70..548e9662 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V5.0.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script V5.0.lsl	
@@ -30,7 +30,7 @@
 // Rev 1.6 5-24-2014 move menu so you can get it by touching, removed many of the KeyValues to RAM for efficiency
 // Rev 1.7 CHANGED_REGION_START, not CHANGED_REGION_START (Opensim difference)
 // Rev 1.8 tuned up Kill NPC, added more flexible upgrader
-// Rev 1.9 Better script injection by link message// Rev 2.0 Added osSetSpeed so you can speed up or slow down an NPC. 
+// Rev 1.9 Better script injection by link message// Rev 2.0 Added osSetSpeed so you can speed up or slow down an NPC.
 // Rev 2.1 No laggy sensor used exept to sit on stuff
 // Rev 2.2 Various sensor fixes
 // Rev 2.3 Sets No Sensor in menu, must be started by hand
@@ -45,7 +45,7 @@
 // Rev 3.4 animation timer cannot be zero or it shuts off timer tweaked
 //         solves the NPC starting up when no sensor is set.
 // Rev 3.5 fixes saving to !Path  notecard
-// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted 
+// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted
 // Rev 3.7 08-11-2015 @attach command added to load an attachment from the inventory to the NPC
 // Rev 3.8 08-17-2015 process queued commands one at a time without calling ProcessNPCLine on link message
 // Rev 3.9 08-23-2011 Queued command fixes including @delete which were not always working
@@ -82,11 +82,11 @@
 // Merged with new Route recorder and notecard writer
 // If the NPC failed to reach a destination it never moved on.
 // Added WAIT global to tune this
-// Exposed many tunable variables and ported the code 
+// Exposed many tunable variables and ported the code
 // Added floating point to times in notecard.
 // Added @sound, @randsound, @whisper, @shout, and @cmd controls.
 // notecards integers are not floats for better control
-// 
+//
 // Link Messages may be used to perform external control by injecting @commands into the stream of actions
 // Example:
 // To chat something, such as with a chat robot
@@ -104,7 +104,7 @@
 //    Enabled = true
 //
 // and then the server has to be restarted.
-// please note that there are better ways to enable NPC in the latest Opensim.  
+// please note that there are better ways to enable NPC in the latest Opensim.
 
 // Commands: All commands begin with an @ sign.  All other lines are ignored
 // @commands may have optional parameters.  The syntax is always:
@@ -139,7 +139,7 @@
 //@attach     InventoryName               attachmentPoint         load an attachment from the inventory to the NPC onto point
 //@teleport   destination (vector)        NaN                     Makes the NPC teleport to destination in the same sim.  They cannot tp to another sim or across the HG
 //@reset      NaN                         NaN                     Deletes the NPC, starts the !Path notecard over.
- 
+
 // Constant            attachmentPoint Comment
 // ATTACH_CHEST            1    chest/sternum
 // ATTACH_HEAD             2    head
@@ -183,16 +183,16 @@
 // ATTACH_AVATAR_CENTER  40    avatar center/root
 
 
-  
+
 //////////////////////////////////////////////////////////
 //                  DEBUG                               //
 //////////////////////////////////////////////////////////
 integer debug = FALSE;
-         // set to TRUE or FALSE for debug chat on various actions
+// set to TRUE or FALSE for debug chat on various actions
 integer LSLEditor = FALSE;        // set to to TRUE to working in  LSLEditor, FALSE for in-world.
-                              // you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
+// you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
 integer iTitleText = FALSE;    // set to TRUE to see debug info in text above the controller
- 
+
 //////////////////////////////////////////////////////////
 //                  TUNABLE CONFIGURATION               //
 //////////////////////////////////////////////////////////
@@ -215,9 +215,9 @@ string    WALK = "Walk";       // the name of the default Walk animation
 string    FLY = "Fly";        // the name of the default Fly animation
 string    RUN = "Run";        // the name of the default Run animation
 string    LAND = "Land";      // the name of the default land animation ( for birds only)
-float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.  
+float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.
 float    SPEEDMULT =0.8;     // 1.0 = regular avatar speed. Smaller numbers slow down walks. Large numbers speed them up.
-integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing" 
+integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing"
 
 // DESCRIPTIONS FIELDS HAVE TO SURVIVE A RESET
 //  These vars are stored  by saving them with KeyValueSet
@@ -271,7 +271,7 @@ list lMenu3 = ["<<<","@notecard","@appearance", "@touch", "@speed",       "@atta
 string sCommand;  // place to store a command for two-prompted ones
 string sParam2;   // place to store a prompt for two-prompted ones
 string priPub = "Owner Only";    // Private or Group
-key kUserKey;        // the person who is controlling the avatar, not the Owner  
+key kUserKey;        // the person who is controlling the avatar, not the Owner
 // the command lists
 list lCommands;  // commands are stored here
 list lNpcCommandList; // Storage for the NPC script.
@@ -318,710 +318,710 @@ list Stack ;              // a command stack from link message input
 
 TimerEvent(float timesent)
 {
-    if (LSLEditor)
-        timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
-        
-    DEBUG("Setting  timer: " + (string) timesent);
-    llSetTimerEvent(timesent);
+	if (LSLEditor)
+		timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
+
+	DEBUG("Setting  timer: " + (string) timesent);
+	llSetTimerEvent(timesent);
 }
 
 // for 4.1 parse a message from a Listen or a Link message
 ParseMsg(string str) {
-    DEBUG("Command In:" + str);
-    if (str=="@go") {
-        SetStop(FALSE); // Let's run the notecard
-        DEBUG("@go running");
-        DoProcessNPCLine();
-    } else {
-        Stack += [str];    // take anything, the controller will filter away non @ stuff
-        if (STATE == NULL)
-            DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
-    }
+	DEBUG("Command In:" + str);
+	if (str=="@go") {
+		SetStop(FALSE); // Let's run the notecard
+		DEBUG("@go running");
+		DoProcessNPCLine();
+	} else {
+			Stack += [str];    // take anything, the controller will filter away non @ stuff
+		if (STATE == NULL)
+			DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
+	}
 }
 
 SetStop(integer what)
 {
-    DEBUG("Stopped set to " + (string ) what);
-    Stopped = what;
+	DEBUG("Stopped set to " + (string ) what);
+	Stopped = what;
 }
 // Do* functions are much like states from the old V2 scripts.
-    
+
 // Save a Path notecard
 DoSave()
-{ 
-    STATE = MakeNotecard;
-    makeText("Stand where you want the NPC to appear, and enter the NPC Name");
+{
+	STATE = MakeNotecard;
+	makeText("Stand where you want the NPC to appear, and enter the NPC Name");
 }
 
 // This function is used to record the path for the NPC
 // Each command can take 0, 1, or 2 params
 DoMenuForCommands() {
-    makeMenu(lAtButtons);
+	makeMenu(lAtButtons);
 }
 
 
 // No one is here when sensors were on, so we kill off the NPC
 DoNobodyHome()
 {
-    DEBUG("Nobody Home");
-    STATE = NobodyHome;
-    if (NPCKey() != NULL_KEY) {
-        osNpcRemove(NPCKey());
-        SaveKey(NULL_KEY);
-    }
-    TimerEvent(5);  // keep ticking to sense avatars   
+	DEBUG("Nobody Home");
+	STATE = NobodyHome;
+	if (NPCKey() != NULL_KEY) {
+		osNpcRemove(NPCKey());
+		SaveKey(NULL_KEY);
+	}
+	TimerEvent(5);  // keep ticking to sense avatars
 }
 
 
 ///////////////////////  STATELIKE BEHAVIOUR  /////////////
-// these StateXX functions need to wait on a timer to fire. 
+// these StateXX functions need to wait on a timer to fire.
 
 // Create a NPC
 StateSpawn() {
-    DEBUG("state spawn " + sNPCName);
-     
-    NPCEnabled = TRUE; //  in world
-    // see if there is already one out there.
-    if (NPCKey() != NULL_KEY) {
-        DEBUG("Already living");
-        return;
-    }
-    
-    STATE = Spawning;        
-    list name = llParseString2List(sNPCName, [" "], []);
-   
-    vector vRezPos = vInitialPos;
-    if (relAbs == "Relative"){
-        vRezPos += llGetPos();
-    }
+	DEBUG("state spawn " + sNPCName);
 
-   // llSay(0,llDumpList2String(name,",")); 
+	NPCEnabled = TRUE; //  in world
+	// see if there is already one out there.
+	if (NPCKey() != NULL_KEY) {
+		DEBUG("Already living");
+		return;
+	}
 
-    DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
-    key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+	STATE = Spawning;
+	list name = llParseString2List(sNPCName, [" "], []);
 
-    llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
-    SaveKey(aKey); // save in description and global, too
-    
-    osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
-    TimerEvent(REZTIME);
-    NPCAnimate(STAND);
+	vector vRezPos = vInitialPos;
+	if (relAbs == "Relative"){
+		vRezPos += llGetPos();
+	}
+
+	// llSay(0,llDumpList2String(name,","));
+
+	DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
+	key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+
+	llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
+	SaveKey(aKey); // save in description and global, too
+
+	osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
+	TimerEvent(REZTIME);
+	NPCAnimate(STAND);
 }
 
 StateSit() {
-    DEBUG ("state sit - looking for " + RAMsit);
-    STATE=Sit;
-    llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state sit - looking for " + RAMsit);
+	STATE=Sit;
+	llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
 
 StateTouch() {
-    DEBUG ("state touch - looking for " + RAMtouch);
-    STATE = Touch;
-    llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state touch - looking for " + RAMtouch);
+	STATE = Touch;
+	llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
- 
+
 DoStand() {
-    DEBUG("state stand");
-    osNpcStand(NPCKey());
+	DEBUG("state stand");
+	osNpcStand(NPCKey());
 }
 
 
 StateAnimate() {
-    
-    DEBUG("state animate");
-    STATE = Animate;
-    NPCAnimate(RAManimationName);
-    if (RAManimationTime <=0 )    // V 3.4 tweak
-        RAManimationTime = 1;
-    TimerEvent(RAManimationTime);
+
+	DEBUG("state animate");
+	STATE = Animate;
+	NPCAnimate(RAManimationName);
+	if (RAManimationTime <=0 )    // V 3.4 tweak
+		RAManimationTime = 1;
+	TimerEvent(RAManimationTime);
 }
-    
+
 StateWalk() {
 
-    DEBUG("Start Walk");
-    //DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
-    STATE = Walking;
-            
-    // walk, fly, run, land
-   if (walkstate == 1) {
-        NPCAnimate(WALK);
-    } else if (walkstate == 2)  {
-        llShout(FLIGHT,"flying");
-        NPCAnimate(FLY);
-    } else if (walkstate == 3) {
-        NPCAnimate(RUN);
-    } else if (walkstate == 4) {
-        NPCAnimate(LAND);
-    } 
-    newDest = vDestPos ;
-    newDest.z += OffsetZ;
-        
-    // notecard is stored as offsets from this box with relative addressing.  Convert to absolute
-    if (relAbs == "Relative"){
-        newDest += llGetPos();
-    }
+	DEBUG("Start Walk");
+	//DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
+	STATE = Walking;
 
-    DEBUG("Moveto:" + (string) newDest);
-    osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);
+	// walk, fly, run, land
+	if (walkstate == 1) {
+		NPCAnimate(WALK);
+	} else if (walkstate == 2)  {
+			llShout(FLIGHT,"flying");
+		NPCAnimate(FLY);
+	} else if (walkstate == 3) {
+			NPCAnimate(RUN);
+	} else if (walkstate == 4) {
+			NPCAnimate(LAND);
+	}
+	newDest = vDestPos ;
+	newDest.z += OffsetZ;
+
+	// notecard is stored as offsets from this box with relative addressing.  Convert to absolute
+	if (relAbs == "Relative"){
+		newDest += llGetPos();
+	}
+
+	DEBUG("Moveto:" + (string) newDest);
+	osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 
 StateWander(){
-    DEBUG("state wander");
-    STATE = Wander;
-    
-    vector point = CirclePoint(RAMwd);
-    DEBUG("CirclePoint:" + (string) point);
-    vWanderPos = vDestPos + point;
-    DEBUG("vWanderPos:" + (string) vWanderPos);
+	DEBUG("state wander");
+	STATE = Wander;
 
-    fTimerVal = WANDERTIME;    // default time to pause after each wander
-    if (WANDERRAND)
-        fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
+	vector point = CirclePoint(RAMwd);
+	DEBUG("CirclePoint:" + (string) point);
+	vWanderPos = vDestPos + point;
+	DEBUG("vWanderPos:" + (string) vWanderPos);
 
-    NPCAnimate(WALK);
+	fTimerVal = WANDERTIME;    // default time to pause after each wander
+	if (WANDERRAND)
+		fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
 
-    DEBUG("Wander to:" + (string) vWanderPos);
+	NPCAnimate(WALK);
 
-    osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);      
+	DEBUG("Wander to:" + (string) vWanderPos);
+
+	osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 StateWanderhold() {
 
-    DEBUG("Wander Hold");
-    STATE = WanderHold;
-       
-     // now that we have reached a wander spot, slow the timer down to the desired value
-    TimerEvent(fTimerVal);
+	DEBUG("Wander Hold");
+	STATE = WanderHold;
+
+	// now that we have reached a wander spot, slow the timer down to the desired value
+	TimerEvent(fTimerVal);
 }
 
 
- 
+
 DoRotate() {
-    DEBUG("@rotate=" + (string) RAMrot); 
-    osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
-}  
+	DEBUG("@rotate=" + (string) RAMrot);
+	osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
+}
 
 
 
 // @pause=10 will do nothing for 10 seconds
 DoPause() {
-    STATE = Paused;
-    if (RAMPause < 0.1)
-        RAMPause = 0.1;
-    DEBUG("@pause=" + (string)RAMPause);
-    TimerEvent(RAMPause);
+	STATE = Paused;
+	if (RAMPause < 0.1)
+		RAMPause = 0.1;
+	DEBUG("@pause=" + (string)RAMPause);
+	TimerEvent(RAMPause);
 }
 
 
 // @stop makes the NPC stop moving in whatever state it is in.  You have to linkmessage to get moving again
-DoStop() {    
-    DEBUG("NPC is Stopped");
-    STATE   = 0;    // accept commands
-    SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-    TimerEvent(0);
-    Stack = []; // v3.8
+DoStop() {
+	DEBUG("NPC is Stopped");
+	STATE   = 0;    // accept commands
+	SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+	TimerEvent(0);
+	Stack = []; // v3.8
 }
-    
+
 // @delete removes the NPC forever. Next command starts it up again at the beginning
 DoDelete() {
-    DEBUG("state delete");
-    osNpcRemove(NPCKey());
-    SaveKey(NULL_KEY);
-    TimerEvent(0);
-    Stack = []; // v3.8
-    STATE = NULL;    // accept commands
+	DEBUG("state delete");
+	osNpcRemove(NPCKey());
+	SaveKey(NULL_KEY);
+	TimerEvent(0);
+	Stack = []; // v3.8
+	STATE = NULL;    // accept commands
 }
 
 // change the appearance of the NPC
 DoAppearance(string notecard) {
-    DEBUG("state appearance");
-    if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
-        DEBUG("Load appearance " + notecard);
-        osNpcLoadAppearance(NPCKey(),notecard);
-    }
-    STATE = NULL;    // accept commands
+	DEBUG("state appearance");
+	if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
+		DEBUG("Load appearance " + notecard);
+		osNpcLoadAppearance(NPCKey(),notecard);
+	}
+	STATE = NULL;    // accept commands
 }
 
 // Change the avatar speed
 DoSpeed(string speed) {
-    float newspeed = (float) speed;
-    if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
-        osSetSpeed(NPCKey(),newspeed);
-    }
-    STATE = NULL;    // accept commands
+	float newspeed = (float) speed;
+	if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
+		osSetSpeed(NPCKey(),newspeed);
+	}
+	STATE = NULL;    // accept commands
 }
 
 DoTeleport(string params) {
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    vector Dest = (vector) itemName;
-    if (Dest != ZERO_VECTOR) {
-        if (relAbs == "Relative"){
-            Dest += llGetPos();
-        }
-        osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
-        
-    } else {
-        llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
-    }
-    STATE = NULL;    // accept commands
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	vector Dest = (vector) itemName;
+	if (Dest != ZERO_VECTOR) {
+		if (relAbs == "Relative"){
+			Dest += llGetPos();
+		}
+		osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
+
+	} else {
+			llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
+	}
+	STATE = NULL;    // accept commands
 }
 
 
 
 DoNewNote (string card) {
-    DEBUG("Load Notecard " + card);    
-    NPCReadNoteCard(card);
-    SetStop(FALSE);
-    STATE = NULL;    // accept commands
+	DEBUG("Load Notecard " + card);
+	NPCReadNoteCard(card);
+	SetStop(FALSE);
+	STATE = NULL;    // accept commands
 }
 DoAttach(string params) {
-    
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    integer attachmentPoint  = (integer) llList2String(Data, 1);
-    if (attachmentPoint > 0
-        && attachmentPoint < 40
-        && llGetInventoryType(itemName) == INVENTORY_OBJECT
-       )
-    {
-        osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
-    }
-    STATE = NULL;    // accept commands
+
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	integer attachmentPoint  = (integer) llList2String(Data, 1);
+	if (attachmentPoint > 0
+		&& attachmentPoint < 40
+			&& llGetInventoryType(itemName) == INVENTORY_OBJECT
+				)
+				{
+					osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
+				}
+	STATE = NULL;    // accept commands
 }
 
 // This loops over the notecard, processing each command
 DoProcessNPCLine() {
-    DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
-    
-    STATE = DoProcess;
-    
-        // auto load a notecard
-    if (! llGetListLength(lNpcCommandList)) {
-        DEBUG("Read Notecard");
-        NPCReadNoteCard(Notecard);
-    }
+	DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
 
-    // look for link messages on the stack
-    string next = llList2String(Stack,0);    // lets see if there is anything from a link message
-    if (llStringLength(next))
-    {
-        Stack = llDeleteSubList(Stack,0,0);
-        ProcessCmd(next);        //lets do this command instead.
-        return;
-    }
+	STATE = DoProcess;
 
-    // @stop issued?
-    if (Stopped) {
-        TimerEvent(0);
-        DEBUG("Stopped, waiting for input");
-        STATE = NULL;
-        return;
-    }
+	// auto load a notecard
+	if (! llGetListLength(lNpcCommandList)) {
+		DEBUG("Read Notecard");
+		NPCReadNoteCard(Notecard);
+	}
 
-    // No, we have an @go for liftoff
-    next = llList2String(lNpcCommandList, 0);        // get the next command
-    DEBUG("Execute:" + next);
-    lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
-        
-    if (llGetListLength(lNpcCommandList) == 0) {
-        DEBUG("EOF");
-    }
-    ProcessCmd(next);
-} 
+	// look for link messages on the stack
+	string next = llList2String(Stack,0);    // lets see if there is anything from a link message
+	if (llStringLength(next))
+	{
+		Stack = llDeleteSubList(Stack,0,0);
+		ProcessCmd(next);        //lets do this command instead.
+		return;
+	}
+
+	// @stop issued?
+	if (Stopped) {
+		TimerEvent(0);
+		DEBUG("Stopped, waiting for input");
+		STATE = NULL;
+		return;
+	}
+
+	// No, we have an @go for liftoff
+	next = llList2String(lNpcCommandList, 0);        // get the next command
+	DEBUG("Execute:" + next);
+	lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
+
+	if (llGetListLength(lNpcCommandList) == 0) {
+		DEBUG("EOF");
+	}
+	ProcessCmd(next);
+}
 
 
 
 ProcessCmd(string cmd) {
 
-    DEBUG("ProcessCmd:" + cmd);
+	DEBUG("ProcessCmd:" + cmd);
 
-    llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
-    if (llGetSubString(cmd, 0, 0) != "@") {
-        DEBUG("ignoring");
-        TimerEvent(QUICK);  // this is so we do not recurse the stack
-        STATE = NULL;
-        return;
-    }
+	llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
+	if (llGetSubString(cmd, 0, 0) != "@") {
+		DEBUG("ignoring");
+		TimerEvent(QUICK);  // this is so we do not recurse the stack
+		STATE = NULL;
+		return;
+	}
 
-    list data  = llParseString2List(cmd, ["="], []);
-    npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
+	list data  = llParseString2List(cmd, ["="], []);
+	npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
 
-    DEBUG("Action:" + npcAction);
-    npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
-    DEBUG("Params:" + npcParams);
-    
-    @commands;
+	DEBUG("Action:" + npcAction);
+	npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
+	DEBUG("Params:" + npcParams);
 
-    ProcessSensor();
-     if (! avatarPresent){
-        DoNobodyHome();
-        DEBUG("No avatar nearby");
-        STATE = NULL;
-        return;
-    }
-    
-    if(npcAction == "@spawn") {
-        DEBUG("@spawn npcParams ");
-        list spawnData = llParseString2List(npcParams, ["|"], []);
-        sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+	@commands;
 
-        vInitialPos = (vector) llList2String(spawnData, 1);        
-        DEBUG("Coords for NPC at " + (string) vInitialPos);
-        StateSpawn();
-        return;
-    }
+	ProcessSensor();
+	if (! avatarPresent){
+		DoNobodyHome();
+		DEBUG("No avatar nearby");
+		STATE = NULL;
+		return;
+	}
 
-    StateSpawn();
-    
-    if(npcAction == "@stop") {
-        DoStop();
-        STATE = NULL;
-        return;
-    }
-    else if(npcAction == "@goto") {
-        DEBUG("goto");
-        integer lastIdx = llGetListLength(lNpcCommandList)-1;
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
-        // Wind commands till goto label.
-        @wind;
-        string next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        if(next1 != npcParams) jump wind;
-        // Wind the label too.
-        next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        // Get next command.
-        list data1  = llParseString2List(next1, ["="], []);
-        npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
-        npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
-        // Reschedule.
-        jump commands;
-    }
-    else if(npcAction == "@sound") {
-        DEBUG("sound");
-        llTriggerSound(npcParams,1.0);
-    }
-    else if(npcAction == "@randsound") {
-        DEBUG("@randsound");
-        integer N = llGetInventoryNumber(INVENTORY_SOUND);
-        integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
-        string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
-        llTriggerSound(toPlay,1.0);
-    }
-    else if(npcAction == "@walk") {
-        DEBUG("@walk");
-        GetDest(npcParams);
-        walkstate = 1;//  walking
-        NPCWalkOption = OS_NPC_NO_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@fly") {
-        GetDest(npcParams);
-        walkstate = 2;//  flying
-        NPCWalkOption = OS_NPC_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@run") {
-        DEBUG("@run");
-        GetDest(npcParams);
-        walkstate = 3;//  running
-        NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@land") {
-        DEBUG("@land");
-        GetDest(npcParams);
-        walkstate = 4;//  landing
-        NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@say") {
-        DEBUG("@say " + npcParams);
-        osNpcSay(NPCKey(), 0, npcParams);
-    }
-    else if(npcAction == "@shout") {
-        DEBUG("@shout");
-        osNpcShout(NPCKey(),0, npcParams);
-    }
-    else if(npcAction == "@whisper") {
-        DEBUG("@whisper " + npcParams);
-        osNpcWhisper(NPCKey(),0, npcParams);
-    }
-    // speak a command on a channel, so you can open doors and control stuff.
-    else if(npcAction == "@cmd") {
-        DEBUG("@cmd");
-        list dataToSpeak = llParseString2List(npcParams, ["|"], []);
-        string channel = llList2String(dataToSpeak,0);
-        DEBUG("Channel:"+(string) channel);
-        integer iChannel = (integer) channel;
-        string stringToSpeak = llList2String(dataToSpeak,1);
-        llSay(iChannel, stringToSpeak);
-    }
-    // stop everything
-    else if(npcAction == "@pause") {
-        RAMPause = (float) npcParams;
-        DoPause();
-        return;
-    }
-    else if(npcAction == "@wander") {
-        list wanderData = llParseString2List(npcParams, ["|"], []);
-        RAMwd = (float) llList2String(wanderData, 0);
-        RAMwc = (integer) llList2String(wanderData, 1);
-        vDestPos = osNpcGetPos(NPCKey());        // set the wander start
-        DEBUG("Starting at " + (string) vDestPos);
-        StateWander();
-        return;
-    }
-    else if(npcAction == "@rotate") {
-        RAMrot = (float) npcParams;
-        DoRotate();
-    }
-    else if(npcAction == "@sit") {
-        RAMsit= npcParams;
-        StateSit();
-        return;
-    }
-    else if(npcAction == "@touch") {
-        RAMtouch= npcParams;
-        StateTouch();
-        return;
-    }
-    else  if(npcAction == "@stand") {
-        DoStand();
-    }
-    else if(npcAction == "@delete") {
-        DoDelete();
-        SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-        return;
-    }
-    else if(npcAction == "@animate") {
-        list animateData = llParseString2List(npcParams, ["|"], []);
-        RAManimationName = llList2String(animateData, 0);
-        RAManimationTime = (float) llList2String(animateData, 1);
-        StateAnimate();
-        return;
-    }
-    else if(npcAction == "@appearance" ){
-        DoAppearance(npcParams);
-    }
-    else if (npcAction =="@speed") {
-        DoSpeed(npcParams);
-    }
-    else if (npcAction =="@notecard") {      
-        DoNewNote(npcParams);
-        Notecard = npcParams;
-    }
-    else if (npcAction == "@attach")
-    {
-        DoAttach(npcParams);
-    }
-    else if (npcAction == "@teleport")
-    {
-        DoTeleport(npcParams);
-    }
-    else if (npcAction == "@reset")
-    {
-        DoDelete();
-        SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
-    }
+	if(npcAction == "@spawn") {
+		DEBUG("@spawn npcParams ");
+		list spawnData = llParseString2List(npcParams, ["|"], []);
+		sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
 
-    STATE = NULL;
-    TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack 
+		vInitialPos = (vector) llList2String(spawnData, 1);
+		DEBUG("Coords for NPC at " + (string) vInitialPos);
+		StateSpawn();
+		return;
+	}
+
+	StateSpawn();
+
+	if(npcAction == "@stop") {
+		DoStop();
+		STATE = NULL;
+		return;
+	}
+	else if(npcAction == "@goto") {
+		DEBUG("goto");
+		integer lastIdx = llGetListLength(lNpcCommandList)-1;
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
+		// Wind commands till goto label.
+		@wind;
+		string next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		if(next1 != npcParams) jump wind;
+		// Wind the label too.
+		next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		// Get next command.
+		list data1  = llParseString2List(next1, ["="], []);
+		npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
+		npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
+		// Reschedule.
+		jump commands;
+	}
+	else if(npcAction == "@sound") {
+		DEBUG("sound");
+		llTriggerSound(npcParams,1.0);
+	}
+	else if(npcAction == "@randsound") {
+		DEBUG("@randsound");
+		integer N = llGetInventoryNumber(INVENTORY_SOUND);
+		integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
+		string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
+		llTriggerSound(toPlay,1.0);
+	}
+	else if(npcAction == "@walk") {
+		DEBUG("@walk");
+		GetDest(npcParams);
+		walkstate = 1;//  walking
+		NPCWalkOption = OS_NPC_NO_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@fly") {
+		GetDest(npcParams);
+		walkstate = 2;//  flying
+		NPCWalkOption = OS_NPC_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@run") {
+		DEBUG("@run");
+		GetDest(npcParams);
+		walkstate = 3;//  running
+		NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@land") {
+		DEBUG("@land");
+		GetDest(npcParams);
+		walkstate = 4;//  landing
+		NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@say") {
+		DEBUG("@say " + npcParams);
+		osNpcSay(NPCKey(), 0, npcParams);
+	}
+	else if(npcAction == "@shout") {
+		DEBUG("@shout");
+		osNpcShout(NPCKey(),0, npcParams);
+	}
+	else if(npcAction == "@whisper") {
+		DEBUG("@whisper " + npcParams);
+		osNpcWhisper(NPCKey(),0, npcParams);
+	}
+	// speak a command on a channel, so you can open doors and control stuff.
+	else if(npcAction == "@cmd") {
+		DEBUG("@cmd");
+		list dataToSpeak = llParseString2List(npcParams, ["|"], []);
+		string channel = llList2String(dataToSpeak,0);
+		DEBUG("Channel:"+(string) channel);
+		integer iChannel = (integer) channel;
+		string stringToSpeak = llList2String(dataToSpeak,1);
+		llSay(iChannel, stringToSpeak);
+	}
+	// stop everything
+	else if(npcAction == "@pause") {
+		RAMPause = (float) npcParams;
+		DoPause();
+		return;
+	}
+	else if(npcAction == "@wander") {
+		list wanderData = llParseString2List(npcParams, ["|"], []);
+		RAMwd = (float) llList2String(wanderData, 0);
+		RAMwc = (integer) llList2String(wanderData, 1);
+		vDestPos = osNpcGetPos(NPCKey());        // set the wander start
+		DEBUG("Starting at " + (string) vDestPos);
+		StateWander();
+		return;
+	}
+	else if(npcAction == "@rotate") {
+		RAMrot = (float) npcParams;
+		DoRotate();
+	}
+	else if(npcAction == "@sit") {
+		RAMsit= npcParams;
+		StateSit();
+		return;
+	}
+	else if(npcAction == "@touch") {
+		RAMtouch= npcParams;
+		StateTouch();
+		return;
+	}
+	else  if(npcAction == "@stand") {
+		DoStand();
+	}
+	else if(npcAction == "@delete") {
+		DoDelete();
+		SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+		return;
+	}
+	else if(npcAction == "@animate") {
+		list animateData = llParseString2List(npcParams, ["|"], []);
+		RAManimationName = llList2String(animateData, 0);
+		RAManimationTime = (float) llList2String(animateData, 1);
+		StateAnimate();
+		return;
+	}
+	else if(npcAction == "@appearance" ){
+		DoAppearance(npcParams);
+	}
+	else if (npcAction =="@speed") {
+		DoSpeed(npcParams);
+	}
+	else if (npcAction =="@notecard") {
+		DoNewNote(npcParams);
+		Notecard = npcParams;
+	}
+	else if (npcAction == "@attach")
+	{
+		DoAttach(npcParams);
+	}
+	else if (npcAction == "@teleport")
+	{
+		DoTeleport(npcParams);
+	}
+	else if (npcAction == "@reset")
+	{
+		DoDelete();
+		SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
+	}
+
+	STATE = NULL;
+	TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack
 }
- 
+
 
 
 /////////////////// UTILITY Functions, not state-like //////////////////
 
 // DEBUG(string) will chat a string or display it as hovertext if debug == TRUE
 DEBUG(string str) {
-    if (debug && ! LSLEditor)
-        llOwnerSay( str);                    // Send the owner debug info 
-    if (debug &&  LSLEditor)
-        llSay(0, str);                    // Send to the Console in LSLEDitor 
-    if (iTitleText) {
-        llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
-    
-    }
-} 
+	if (debug && ! LSLEditor)
+		llOwnerSay( str);                    // Send the owner debug info
+	if (debug &&  LSLEditor)
+		llSay(0, str);                    // Send to the Console in LSLEDitor
+	if (iTitleText) {
+		llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
+
+	}
+}
 
 GetDest(string npcParams) {
-    list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
-    vDestPos.x = llList2Float(dest, 0);
-    vDestPos.y = llList2Float(dest, 1);
-    vDestPos.z = llList2Float(dest, 2);
+	list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
+	vDestPos.x = llList2Float(dest, 0);
+	vDestPos.y = llList2Float(dest, 1);
+	vDestPos.z = llList2Float(dest, 2);
 }
 
 NPCReadNoteCard(string Note) {
-    DEBUG("NPCReadNoteCard");             
-    lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
-}  
-  
+	DEBUG("NPCReadNoteCard");
+	lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
+}
+
 integer SenseAvatar()
 {
-    //Returns a strided list of the UUID, position, and name of each avatar in the region
-    list avatars = llGetAgentList(AGENT_LIST_REGION ,[]);
-    integer numOfAvatars = llGetListLength(avatars);
-    if (numOfAvatars == 0)
-    {
-        DEBUG("No people, no NPC's");
-        return 0;
-    }
-    DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's"); 
-        
-    integer nAvatars;
-    integer i;
-    for( i = 0;i < numOfAvatars; i++) {
-        key aviKey = llList2Key(avatars,i);
-        if (!osIsNpc(aviKey)) {
-            list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
-            vector pos = llList2Vector(detail,0);
-            float dist = llVecDist(pos, llGetPos());
-            if (dist  < RANGE)
-            {
-                nAvatars++;
-                DEBUG("In range:" + llKey2Name(aviKey));
-            } else {
-               // DEBUG("*Not in range:" + llKey2Name(aviKey));
-            }
-        } else {
-          //  DEBUG("NPC: " + llKey2Name(aviKey));
-        }
-    }
-    //DEBUG("Located " + (string) nAvatars + " avatars");
-    return nAvatars;
-} 
- 
+	//Returns a strided list of the UUID, position, and name of each avatar in the region
+	list avatars = llGetAgentList(AGENT_LIST_REGION ,[]);
+	integer numOfAvatars = llGetListLength(avatars);
+	if (numOfAvatars == 0)
+	{
+		DEBUG("No people, no NPC's");
+		return 0;
+	}
+	DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's");
+
+	integer nAvatars;
+	integer i;
+	for( i = 0;i < numOfAvatars; i++) {
+		key aviKey = llList2Key(avatars,i);
+		if (!osIsNpc(aviKey)) {
+			list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
+			vector pos = llList2Vector(detail,0);
+			float dist = llVecDist(pos, llGetPos());
+			if (dist  < RANGE)
+			{
+				nAvatars++;
+				DEBUG("In range:" + llKey2Name(aviKey));
+			} else {
+					// DEBUG("*Not in range:" + llKey2Name(aviKey));
+				}
+		} else {
+				//  DEBUG("NPC: " + llKey2Name(aviKey));
+			}
+	}
+	//DEBUG("Located " + (string) nAvatars + " avatars");
+	return nAvatars;
+}
+
 // return TRUE if the avatar is owner when private is set, or TRUE if the avatar is in the same group and GROUP is set.
 integer checkPerms() {
 
-    integer group = (integer) KeyValueGet("pr");
-    if (! group)
-        priPub = "Owner Only";
-    else
-        priPub = "Group";
-    
-    
-    if (llDetectedKey(0) == llGetOwner()){
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
- 
-    if ( group && llDetectedGroup(0)) {
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
-    kUserKey = llDetectedKey(0);
-    return FALSE;
+	integer group = (integer) KeyValueGet("pr");
+	if (! group)
+		priPub = "Owner Only";
+	else
+		priPub = "Group";
+
+
+	if (llDetectedKey(0) == llGetOwner()){
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+
+	if ( group && llDetectedGroup(0)) {
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+	kUserKey = llDetectedKey(0);
+	return FALSE;
 }
 
 
 
 NPCAnimate(string anim)
 {
-    DEBUG("Start Anim: " + anim);
-    if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
-        
-        if (lastANIM != anim) {
-            if(llStringLength(lastANIM)) {
-                osNpcStopAnimation(NPCKey(), lastANIM);  
-            }
-            osNpcPlayAnimation(NPCKey(), anim);
-            lastANIM = anim;
-        }            
-    } else {
-        llSay(DEBUG_CHANNEL, "No animation named " + anim);
-    }
-} 
+	DEBUG("Start Anim: " + anim);
+	if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
+
+		if (lastANIM != anim) {
+			if(llStringLength(lastANIM)) {
+				osNpcStopAnimation(NPCKey(), lastANIM);
+			}
+			osNpcPlayAnimation(NPCKey(), anim);
+			lastANIM = anim;
+		}
+	} else {
+			llSay(DEBUG_CHANNEL, "No animation named " + anim);
+	}
+}
 
 // Kill a NPC by Name
 Kill(string param)
 {
-    integer count;
-    list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\    
-    integer i;
-    integer j = llGetListLength(avatars);
-    for (i=0 ; i <= j; i+=3){
-        
-        string desired = llList2String(avatars,i+2);
-        desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
-        
-        if (desired == param){
-            vector v = llList2Vector(avatars,i+1);
-            key target = llList2Key(avatars,i);    // get the UUID of the avatar
-            osNpcRemove(target);
-            
-            llOwnerSay("Removed " + param+ " at  location " + (string) v);
-            count++;
-        }
-    }
-    
-    NPCEnabled = FALSE; // not in world
-    SaveKey(NULL_KEY );    // Rev 4.4
-    
-    if (count)
-        llOwnerSay("Removed " + (string) count + " NPC's");
-    else
-        llOwnerSay("Could not locate " + param);
+	integer count;
+	list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\
+	integer i;
+	integer j = llGetListLength(avatars);
+	for (i=0 ; i <= j; i+=3){
+
+		string desired = llList2String(avatars,i+2);
+		desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
+
+		if (desired == param){
+			vector v = llList2Vector(avatars,i+1);
+			key target = llList2Key(avatars,i);    // get the UUID of the avatar
+			osNpcRemove(target);
+
+			llOwnerSay("Removed " + param+ " at  location " + (string) v);
+			count++;
+		}
+	}
+
+	NPCEnabled = FALSE; // not in world
+	SaveKey(NULL_KEY );    // Rev 4.4
+
+	if (count)
+		llOwnerSay("Removed " + (string) count + " NPC's");
+	else
+		llOwnerSay("Could not locate " + param);
 }
 
 
 // return a String for the position we are at. Strings used as the caller wants strings
 string Pos()
 {
-    vector where = llGetPos(); // find the box position
-   
-    where.z +=    OffsetZ;  // use the ground position + an offset 
-        
-    if (LSLEditor)
-        where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
-   
-   // if attached the height will be too high by 1/2 the agent size
-    if (llGetAttached()) {
-        vector size = llGetAgentSize(llGetOwner());   
-        float Z = size.z;
-        where.z -= Z/2;  
-    }
-   
-    // DEBUG("Pos= " + (string) where);
-    return (string) where;
+	vector where = llGetPos(); // find the box position
+
+	where.z +=    OffsetZ;  // use the ground position + an offset
+
+	if (LSLEditor)
+		where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
+
+	// if attached the height will be too high by 1/2 the agent size
+	if (llGetAttached()) {
+		vector size = llGetAgentSize(llGetOwner());
+		float Z = size.z;
+		where.z -= Z/2;
+	}
+
+	// DEBUG("Pos= " + (string) where);
+	return (string) where;
 }
 
 // setup a menu with a timer for timeouts, called by all make*()
 menu()
 {
-    llListenRemove(iHandle);
-    iChannel = llCeil(llFrand(100000) + 20000);
-    iHandle = llListen(iChannel,"","","");
-    TimerEvent(30.0);
-    MENU = TRUE;
+	llListenRemove(iHandle);
+	iChannel = llCeil(llFrand(100000) + 20000);
+	iHandle = llListen(iChannel,"","","");
+	TimerEvent(30.0);
+	MENU = TRUE;
 }
 
 // make a text box
 makeText(string Param)
-{ 
-    menu();
-    llTextBox(kUserKey, Param, iChannel);
+{
+	menu();
+	llTextBox(kUserKey, Param, iChannel);
 }
 
 // top level menu
 makeMainMenu()
 {
-    menu();
-    list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
+	menu();
+	list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
 }
 
 
@@ -1029,11 +1029,11 @@ makeMainMenu()
 // top level menu for non group/ non owners
 makeUserMenu()
 {
-    if (!allowUsers) return;
-    
-    menu();
-    list buttons = ["Start NPC","Stop NPC"];
-    llDialog(kUserKey,"Choose",buttons,iChannel);
+	if (!allowUsers) return;
+
+	menu();
+	list buttons = ["Start NPC","Stop NPC"];
+	llDialog(kUserKey,"Choose",buttons,iChannel);
 }
 
 
@@ -1041,199 +1041,199 @@ makeUserMenu()
 // programmable menu for @commands
 makeMenu(list buttons)
 {
-    menu();
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
+	menu();
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
 }
 
 
 // make one or two text boxes with prompts
 Text(string cmd, string p1, string p2)
 {
-    sCommand = cmd;
-     sParam2 = "";
-    if (llStringLength(p2))
-        sParam2 = p2;
+	sCommand = cmd;
+	sParam2 = "";
+	if (llStringLength(p2))
+		sParam2 = p2;
 
-    makeText(p1);
-} 
+	makeText(p1);
+}
 
 // Set the Avatar Present flag - if sensors are off and we are force run, there will be one present.
 ProcessSensor()
 {
-    integer SensorOn;
-    if ("on" == KeyValueGet("se"))
-    {
-        SensorOn = TRUE;        // we need to scan for avatars
-    } else {
-        SensorOn = FALSE;        // we need to scan for avatars
-    }
-    DEBUG("Sensor:" + (string) SensorOn);
-    
-    integer n = SenseAvatar();
-    
-    DEBUG("Avatars:" + (string) n);
-    if (SensorOn && n)
-        avatarPresent = TRUE;   // someone is here and we need to tell the system to run
-    else if (SensorOn && !n)
-        avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
-    else {       // sensor is off, lete see if there is a NPC. If so, we are ON 
-       // DEBUG("NPCEnabled:" + (string) NPCEnabled);
-       
-        if (NPCEnabled)
-            avatarPresent = TRUE;  
-        else
-            avatarPresent = FALSE;   
-    }
-    
-    //  start up from when when no one is near
-    if (avatarPresent && STATE == NobodyHome)
-        STATE = NULL;
-    
-    DEBUG("Avatar Present: " + (string) avatarPresent);
+	integer SensorOn;
+	if ("on" == KeyValueGet("se"))
+	{
+		SensorOn = TRUE;        // we need to scan for avatars
+	} else {
+			SensorOn = FALSE;        // we need to scan for avatars
+	}
+	DEBUG("Sensor:" + (string) SensorOn);
+
+	integer n = SenseAvatar();
+
+	DEBUG("Avatars:" + (string) n);
+	if (SensorOn && n)
+		avatarPresent = TRUE;   // someone is here and we need to tell the system to run
+	else if (SensorOn && !n)
+		avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
+	else {       // sensor is off, lete see if there is a NPC. If so, we are ON
+		// DEBUG("NPCEnabled:" + (string) NPCEnabled);
+
+		if (NPCEnabled)
+			avatarPresent = TRUE;
+		else
+			avatarPresent = FALSE;
+	}
+
+	//  start up from when when no one is near
+	if (avatarPresent && STATE == NobodyHome)
+		STATE = NULL;
+
+	DEBUG("Avatar Present: " + (string) avatarPresent);
 }
 
 vector CirclePoint(float radius) {
-    float x = llFrand(radius *2) - radius;        // +/- radius, randomized
-    float y = llFrand(radius *2) - radius;        // +/- radius, randomized
-    return <x, y, 0>;        // so this should always happen
+	float x = llFrand(radius *2) - radius;        // +/- radius, randomized
+	float y = llFrand(radius *2) - radius;        // +/- radius, randomized
+	return <x, y, 0>;        // so this should always happen
 }
 
 string KeyValueGet(string var) {
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k != var) jump continue;
-        //DEBUG("got " + var + " = " +  llList2String(data, 1));
-        return llList2String(data, 1);
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    return "";
-} 
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k != var) jump continue;
+		//DEBUG("got " + var + " = " +  llList2String(data, 1));
+		return llList2String(data, 1);
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	return "";
+}
 
 KeyValueSet(string var, string val) {
 
-    //DEBUG("set " + var + " = " + val);
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    if(llGetListLength(dVars) == 0)
-    {
-        llSetObjectDesc(var + "=" + val);
-        return;
-    }
-    list result = [];
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k == "") jump continue;
-        if(k == var && val == "") jump continue;
-        if(k == var) {
-            result += k + "=" + val;
-            val = "";
-            jump continue;
-        }
-        string v = llList2String(data, 1);
-        if(v == "") jump continue;
-        result += k + "=" + v;
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    if(val != "") result += var + "=" + val;
-    llSetObjectDesc(llDumpList2String(result, "&"));
+	//DEBUG("set " + var + " = " + val);
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	if(llGetListLength(dVars) == 0)
+	{
+		llSetObjectDesc(var + "=" + val);
+		return;
+	}
+	list result = [];
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k == "") jump continue;
+		if(k == var && val == "") jump continue;
+		if(k == var) {
+			result += k + "=" + val;
+			val = "";
+			jump continue;
+		}
+		string v = llList2String(data, 1);
+		if(v == "") jump continue;
+		result += k + "=" + v;
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	if(val != "") result += var + "=" + val;
+	llSetObjectDesc(llDumpList2String(result, "&"));
 }
 
 
 // clear RAM
 Clr() {
 
-    lCommands = [];
-    llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
-    makeMainMenu();
+	lCommands = [];
+	llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
+	makeMainMenu();
 }
 
 integer checkNoteCards()
 {
-    // Check that they have saved an Appeaance and Path notecard
-    integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
-    
-    integer i;
-    integer count;
-    for (; i < num; i++){
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
-            count++;
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
-            count++;
-    }
-    DEBUG("Checked " + (string) count + " Notecards");
-    // if we have both, run the NPC
-    return count;
+	// Check that they have saved an Appeaance and Path notecard
+	integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
+
+	integer i;
+	integer count;
+	for (; i < num; i++){
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
+			count++;
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
+			count++;
+	}
+	DEBUG("Checked " + (string) count + " Notecards");
+	// if we have both, run the NPC
+	return count;
 }
 
 Update(string SName) {
-         
-    // delete all NPC* scripts except myself
-    integer i;
-    integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
-    for (i = 0; i < j; i++) {
-        string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
-        string match = llGetSubString(targetName,0,2);
-        
-        if (match == SName && llGetScriptName() != targetName){
-                llOwnerSay("Upgrading " + targetName);
-            if (! LSLEditor){        // lets not kill the editor
-                llRemoveInventory(targetName);
-            }
-        }
-    }
+
+	// delete all NPC* scripts except myself
+	integer i;
+	integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
+	for (i = 0; i < j; i++) {
+		string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
+		string match = llGetSubString(targetName,0,2);
+
+		if (match == SName && llGetScriptName() != targetName){
+			llOwnerSay("Upgrading " + targetName);
+			if (! LSLEditor){        // lets not kill the editor
+				llRemoveInventory(targetName);
+			}
+		}
+	}
 }
 
 // Get all default saved params from the Description
 GetSwitches()
 {
-         string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
-        if (rA == "A")
-            relAbs = "Absolute";
-        else  if (rA == "R")
-            relAbs = "Relative";
-        else
-            relAbs = "Absolute";
+	string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
+	if (rA == "A")
+		relAbs = "Absolute";
+	else  if (rA == "R")
+		relAbs = "Relative";
+	else
+		relAbs = "Absolute";
 
-            
-        // reenable NPC if sensor is on.
-        if ("on" == KeyValueGet("se"))
-        {
-            NPCEnabled = TRUE;
-            mSensor  = "Sense is On";
-            ProcessSensor();       // fake 1 avatar to get it rezzed
-        } else {
-            mSensor  = "Sense is Off";
-        }
-    }
+
+	// reenable NPC if sensor is on.
+	if ("on" == KeyValueGet("se"))
+	{
+		NPCEnabled = TRUE;
+		mSensor  = "Sense is On";
+		ProcessSensor();       // fake 1 avatar to get it rezzed
+	} else {
+			mSensor  = "Sense is Off";
+	}
+}
 
 
 SaveKey(key akey)
 {
-    DEBUG("Saving Key of " + (string) akey);
-    KeyValueSet("key", akey);
-    if (akey !=  (key) KeyValueGet("key") )
-    {
-        DEBUG("Fatal error, cannot save key");
-    }
-    gNpcKey = akey;
+	DEBUG("Saving Key of " + (string) akey);
+	KeyValueSet("key", akey);
+	if (akey !=  (key) KeyValueGet("key") )
+	{
+		DEBUG("Fatal error, cannot save key");
+	}
+	gNpcKey = akey;
 }
 
 
 key NPCKey()
 {
-    key akey = gNpcKey;   // from cached copy
-    // gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
-    if (gNpcKey == NULL_KEY)
-    {
-        //DEBUG("Get DKey");
-        akey = KeyValueGet("key");    // from Description of the prim
-    }
-   // DEBUG("NPC KEY:" + (string) akey);   
-    return  akey;
+	key akey = gNpcKey;   // from cached copy
+	// gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
+	if (gNpcKey == NULL_KEY)
+	{
+		//DEBUG("Get DKey");
+		akey = KeyValueGet("key");    // from Description of the prim
+	}
+	// DEBUG("NPC KEY:" + (string) akey);
+	return  akey;
 }
 
 
@@ -1242,453 +1242,453 @@ key NPCKey()
 
 default
 {
-    changed(integer change) {
-        if(change & CHANGED_REGION_START) {
-            llResetScript();
-        }
-    }
-    
-    on_rez(integer start_param)
-    {
-        llResetScript();
-    }
+	changed(integer change) {
+		if(change & CHANGED_REGION_START) {
+			llResetScript();
+		}
+	}
 
-    state_entry() {
-        
-        llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
-        DoDelete(); // kill any NPC that is out running
-        Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
-        GetSwitches(); // Get all default saved params from the Description
+	on_rez(integer start_param)
+	{
+		llResetScript();
+	}
 
-        // 4.1 allow listeners to send us commands
-        if (allowListener)
-            llListen(link_Channel,"","","");
-        TimerEvent(TIMER);
-    } 
+	state_entry() {
+
+		llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
+		DoDelete(); // kill any NPC that is out running
+		Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
+		GetSwitches(); // Get all default saved params from the Description
+
+		// 4.1 allow listeners to send us commands
+		if (allowListener)
+			llListen(link_Channel,"","","");
+		TimerEvent(TIMER);
+	}
 
 
-    touch_start(integer n) 
-    {           // if touched, make a menu
-    
-        if (checkPerms()) {
-            if (RecordPath == STATE) {
-                makeMenu(lAtButtons); 
-            }   else {
-                makeMainMenu();
-            }
-        } else {
-            makeUserMenu();
-        }
-    }
+	touch_start(integer n)
+	{           // if touched, make a menu
 
-    // menu listener
-    listen(integer iChannel, string name, key id, string message) {
+		if (checkPerms()) {
+			if (RecordPath == STATE) {
+				makeMenu(lAtButtons);
+			}   else {
+					makeMainMenu();
+			}
+		} else {
+				makeUserMenu();
+		}
+	}
 
-        // process @commands that come in via the listener
-        if (iChannel == link_Channel)
-        {
-            ParseMsg(message);
-            return;
-        }
-        
-        if (MENU) {
-            llListenRemove(iHandle);
-            MENU = 0;       // menu is off
-            iHandle = 0;
-        }
-        
-        if (message == "Stop NPC")
-        {
-            lNpcCommandList = []; // force reload of notecard
-            NPCEnabled = FALSE;
-            if (NPCKey() != NULL_KEY){
-                Kill(sNPCName);
-            } else {
-                bNPC_STOP = TRUE;
-                makeText("Enter name of an NPC to stop");
-            }
-        }
-        else if (message == "Menu" ) {
-            makeMainMenu();
-        }
-        else if (message == "Erase RAM"){
-            Clr();
-        }
-        else if (message == "Relative"){
-            relAbs = "Absolute";
-            KeyValueSet("co","A");   // remember coordinates = A
-            Clr();
-        }
-        else if (message == "Absolute"){
-            relAbs = "Relative";
-            KeyValueSet("co","R");   // remember coordinates = R
-            Clr();
-        }
-        else if (message == "Recording"){
-            DoMenuForCommands();        // show them the recording menu
-        }
-        else if (message == "Owner Only") {
-            priPub = "Group";
-            KeyValueSet("pr","1");
+	// menu listener
+	listen(integer iChannel, string name, key id, string message) {
 
-            llOwnerSay("Group members have control");
-            makeMainMenu();
-        }
-        else if (message == "Group") {
-            priPub = "Owner Only";
-            KeyValueSet("pr","0");
-            llOwnerSay("Only you have control");
-            makeMainMenu();
-        }
-        else if (message == "Sense is On") {
-            mSensor ="Sense is Off";
-            KeyValueSet("se", "off");
-            llOwnerSay(mSensor);
-            makeMainMenu();
-        }
-        else if (message == "Sense is Off") {
-            mSensor ="Sense is On";
-            llOwnerSay(mSensor);
-            KeyValueSet("se", "on");
-            
-            NPCEnabled = TRUE;
-            
-            integer count = checkNoteCards();
-            if (count >= 2)  {
-                DEBUG("Notecards ok, DoProcessNPCLine");
-                DoProcessNPCLine();
-                return;
-            }
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
+		// process @commands that come in via the listener
+		if (iChannel == link_Channel)
+		{
+			ParseMsg(message);
+			return;
+		}
 
-            llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
-            makeMainMenu();
-        }
-        else if (message == "Appearance")  {
-            llRemoveInventory(Appearance);            // delete the notecard
-            osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard 
-            llOwnerSay("Your outfit has been saved");
-            makeMainMenu();
-        }
-        else if (message == "Save") {
-            if (llGetListLength(lCommands) == 0) {
-                llOwnerSay("Nothing recorded, you need to make a recording first");
-                makeMainMenu();
-                return;
-            }
-            DoSave();
-        }
-        else if (message == "Help"){
-            llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
-            makeMainMenu();
-        }
-        else if (message == "Start NPC")    {
-            integer count = checkNoteCards();
+		if (MENU) {
+			llListenRemove(iHandle);
+			MENU = 0;       // menu is off
+			iHandle = 0;
+		}
 
-            NPCEnabled = TRUE;
+		if (message == "Stop NPC")
+		{
+			lNpcCommandList = []; // force reload of notecard
+			NPCEnabled = FALSE;
+			if (NPCKey() != NULL_KEY){
+				Kill(sNPCName);
+			} else {
+					bNPC_STOP = TRUE;
+				makeText("Enter name of an NPC to stop");
+			}
+		}
+		else if (message == "Menu" ) {
+			makeMainMenu();
+		}
+		else if (message == "Erase RAM"){
+			Clr();
+		}
+		else if (message == "Relative"){
+			relAbs = "Absolute";
+			KeyValueSet("co","A");   // remember coordinates = A
+			Clr();
+		}
+		else if (message == "Absolute"){
+			relAbs = "Relative";
+			KeyValueSet("co","R");   // remember coordinates = R
+			Clr();
+		}
+		else if (message == "Recording"){
+			DoMenuForCommands();        // show them the recording menu
+		}
+		else if (message == "Owner Only") {
+			priPub = "Group";
+			KeyValueSet("pr","1");
 
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
-            
-            if (count >= 2) {
-                DEBUG("Notecards approved , calling DoProcessNPCLine");
-                SetStop(FALSE); // Let's run the notecard
-                DoProcessNPCLine();
-                return;
-            }
+			llOwnerSay("Group members have control");
+			makeMainMenu();
+		}
+		else if (message == "Group") {
+			priPub = "Owner Only";
+			KeyValueSet("pr","0");
+			llOwnerSay("Only you have control");
+			makeMainMenu();
+		}
+		else if (message == "Sense is On") {
+			mSensor ="Sense is Off";
+			KeyValueSet("se", "off");
+			llOwnerSay(mSensor);
+			makeMainMenu();
+		}
+		else if (message == "Sense is Off") {
+			mSensor ="Sense is On";
+			llOwnerSay(mSensor);
+			KeyValueSet("se", "on");
 
-            llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
-      
-        }
-        else if (bNPC_STOP){
-            bNPC_STOP = FALSE;
-            Kill(message);
-        }
-        else if (message == ">>"){
-            makeMenu(lMenu2);
-        }
-        else if (message == ">>>"){
-            makeMenu(lMenu3);
-        }
-        else if (message == "<<") {
-            makeMenu(lAtButtons);
-        }
-        else if (message == "<<<") {
-            makeMenu(lMenu2);
-        }
-        else if (message == "@comment"){
-            Text("# ","Enter a comment","");
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@run"){
-            lCommands += "@run=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@fly"){
-            lCommands += "@fly=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@land"){
-            lCommands += "@land=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@walk") {
-            lCommands += "@walk=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@sound"){
-            Text("@sound=","Enter a sound name or UUID to trigger","");
-        }
-        else if (message == "@randsound"){
-            lCommands += "@randsound"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@say") {
-            Text("@say=","Enter what the NPC will say","");
-        }
-        else if (message == "@whisper"){
-            Text("@whisper=","Enter what the NPC will whisper","");
-        }
-        else if (message == "@shout"){
-            Text("@shout=","Enter what the NPC will shout","");
-        }
-        else if (message == "@wander") {
-            Text("@wander=","Enter radius to wander","Enter number of wanders");
-        }
-        else if (message == "@pause") {
-            Text("@pause=","Enter time to pause","");
-        }
-        else if (message == "@rotate") {
-            Text("@rotate=","Enter degrees to rotate","");
-        }
-        else if (message == "@sit"){
-            Text("@sit=","Enter name of object to sit on","");
-        }
-        else if (message == "@teleport"){
-            lCommands += "@teleport=" + Pos() + "\n";
-            llOwnerSay("teleport to position: " + Pos());
-            makeMenu(lMenu3);
-        }
-        else if (message == "@touch"){
-            Text("@touch=","Enter name of object to touch","");
-        }
-        else if (message == "@cmd"){
-            Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
-        }
-        else if (message == "@stand"){
-            lCommands += "@stand\n";
-            llOwnerSay("Stand Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@animate"){
-            Text("@animate=","Enter animation name to play","Enter time to play the animation");
-        }
-        else if (message == "@attach"){
-            Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
-        }
-         else if (message == "@speed"){
-            Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
-        }
-               
+			NPCEnabled = TRUE;
 
-        // Save NPC name
-        else if (MakeNotecard == STATE) {
-            sNPCName = message; // in case we need to kill it.
-            
-            vector  vDest = (vector)  Pos();
+			integer count = checkNoteCards();
+			if (count >= 2)  {
+				DEBUG("Notecards ok, DoProcessNPCLine");
+				DoProcessNPCLine();
+				return;
+			}
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-            if (relAbs == "Relative")
-            {
-                vDest  -= llGetPos();    // just an offset for relative
-            }
-            sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
-            integer i;
-            integer j = llGetListLength(lCommands);
-            for (; i < j; i++){
-                // get the command to save to the notecard
-                string line = llList2String(lCommands,i);
-                if (relAbs == "Absolute") {
-                    sNotecard += line;    // add the un-modified string to the notecard
-                } else {
-                        // since we have to record absolute coords since we do not know where the box goes until they press Save,
-                        // we process the absolute to relative conversion for walks here
-                        list parts = llParseString2List(line,["="],[]); //get the @command
+			llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
+			makeMainMenu();
+		}
+		else if (message == "Appearance")  {
+			llRemoveInventory(Appearance);            // delete the notecard
+			osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard
+			llOwnerSay("Your outfit has been saved");
+			makeMainMenu();
+		}
+		else if (message == "Save") {
+			if (llGetListLength(lCommands) == 0) {
+				llOwnerSay("Nothing recorded, you need to make a recording first");
+				makeMainMenu();
+				return;
+			}
+			DoSave();
+		}
+		else if (message == "Help"){
+			llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
+			makeMainMenu();
+		}
+		else if (message == "Start NPC")    {
+			integer count = checkNoteCards();
 
-                    if (llList2String(parts,0) == "@walk") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@walk=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@fly") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@fly=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@run") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@run=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@land") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@land=" + (string) vec + "\n";
-                    }
-                    else {
-                        sNotecard += line;    // add the un-modified string to the notecard
-                    }
-                }
-            }
-            llRemoveInventory(Notecard);        // delete the old notecard
-            osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
-            llSay(0,sNotecard);
-            llOwnerSay("Commands notecard has been written");
-            STATE = NULL;
-        } // MakeNotecard
+			NPCEnabled = TRUE;
 
-        else  if (! llStringLength(sParam2)) {
-            lCommands +=  sCommand + message + "\n";
-            llOwnerSay("Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (llStringLength(sParam2)){
-            sCommand = sCommand + message + "|";
-            llOwnerSay("Recorded");
-            makeText(sParam2);
-            sParam2 = "";
-        }
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-    }
+			if (count >= 2) {
+				DEBUG("Notecards approved , calling DoProcessNPCLine");
+				SetStop(FALSE); // Let's run the notecard
+				DoProcessNPCLine();
+				return;
+			}
+
+			llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
+
+		}
+		else if (bNPC_STOP){
+			bNPC_STOP = FALSE;
+			Kill(message);
+		}
+		else if (message == ">>"){
+			makeMenu(lMenu2);
+		}
+		else if (message == ">>>"){
+			makeMenu(lMenu3);
+		}
+		else if (message == "<<") {
+			makeMenu(lAtButtons);
+		}
+		else if (message == "<<<") {
+			makeMenu(lMenu2);
+		}
+		else if (message == "@comment"){
+			Text("# ","Enter a comment","");
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@run"){
+			lCommands += "@run=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@fly"){
+			lCommands += "@fly=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@land"){
+			lCommands += "@land=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@walk") {
+			lCommands += "@walk=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@sound"){
+			Text("@sound=","Enter a sound name or UUID to trigger","");
+		}
+		else if (message == "@randsound"){
+			lCommands += "@randsound"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@say") {
+			Text("@say=","Enter what the NPC will say","");
+		}
+		else if (message == "@whisper"){
+			Text("@whisper=","Enter what the NPC will whisper","");
+		}
+		else if (message == "@shout"){
+			Text("@shout=","Enter what the NPC will shout","");
+		}
+		else if (message == "@wander") {
+			Text("@wander=","Enter radius to wander","Enter number of wanders");
+		}
+		else if (message == "@pause") {
+			Text("@pause=","Enter time to pause","");
+		}
+		else if (message == "@rotate") {
+			Text("@rotate=","Enter degrees to rotate","");
+		}
+		else if (message == "@sit"){
+			Text("@sit=","Enter name of object to sit on","");
+		}
+		else if (message == "@teleport"){
+			lCommands += "@teleport=" + Pos() + "\n";
+			llOwnerSay("teleport to position: " + Pos());
+			makeMenu(lMenu3);
+		}
+		else if (message == "@touch"){
+			Text("@touch=","Enter name of object to touch","");
+		}
+		else if (message == "@cmd"){
+			Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
+		}
+		else if (message == "@stand"){
+			lCommands += "@stand\n";
+			llOwnerSay("Stand Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@animate"){
+			Text("@animate=","Enter animation name to play","Enter time to play the animation");
+		}
+		else if (message == "@attach"){
+			Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
+		}
+		else if (message == "@speed"){
+			Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
+		}
+
+
+		// Save NPC name
+		else if (MakeNotecard == STATE) {
+			sNPCName = message; // in case we need to kill it.
+
+			vector  vDest = (vector)  Pos();
+
+			if (relAbs == "Relative")
+			{
+				vDest  -= llGetPos();    // just an offset for relative
+			}
+			sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
+			integer i;
+			integer j = llGetListLength(lCommands);
+			for (; i < j; i++){
+				// get the command to save to the notecard
+				string line = llList2String(lCommands,i);
+				if (relAbs == "Absolute") {
+					sNotecard += line;    // add the un-modified string to the notecard
+				} else {
+						// since we have to record absolute coords since we do not know where the box goes until they press Save,
+						// we process the absolute to relative conversion for walks here
+						list parts = llParseString2List(line,["="],[]); //get the @command
+
+					if (llList2String(parts,0) == "@walk") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@walk=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@fly") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@fly=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@run") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@run=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@land") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@land=" + (string) vec + "\n";
+					}
+					else {
+						sNotecard += line;    // add the un-modified string to the notecard
+					}
+				}
+			}
+			llRemoveInventory(Notecard);        // delete the old notecard
+			osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
+			llSay(0,sNotecard);
+			llOwnerSay("Commands notecard has been written");
+			STATE = NULL;
+		} // MakeNotecard
+
+		else  if (! llStringLength(sParam2)) {
+			lCommands +=  sCommand + message + "\n";
+			llOwnerSay("Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (llStringLength(sParam2)){
+			sCommand = sCommand + message + "|";
+			llOwnerSay("Recorded");
+			makeText(sParam2);
+			sParam2 = "";
+		}
+
+	}
 
 
 
-    timer(){
-       // DEBUG("tick");
-        
-        // if llDialog is up, kill the listener for the dialog box.
-        if (iHandle) {
-            llOwnerSay("Menu timed out");
-            llListenRemove(iHandle);
-            iHandle = 0;
-            return;             // ^^^^^^^^^^^^^^^^^^^^^^^
-        }
-        // if NoBodyHome, we are sensing for an avatar
-        else if (NobodyHome == STATE) {
-            ProcessSensor();
-            return;
-        }
-        // if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
-        else if (Spawning == STATE) {
-            STATE = NULL;
-            TimerEvent(TIMER);
-        }
-        // We end aniamtions with a timer
-        else if (Animate == STATE){
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-        }
-        
-        else if (Walking == STATE) {
-            if (--iWaitCounter) {
-                DEBUG("still walking...");
-                if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
-                    return;
-                }
-            }
+	timer(){
+		// DEBUG("tick");
 
-            DEBUG("At Destination: " + (string) newDest);
-            
-            // walk, fly, run, land
-            if (walkstate == 1) {
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 2)  {
-                    // nothing
-                } else if (walkstate == 3) {
-                     NPCAnimate(STAND);
-                     NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 4) {
-                llShout(FLIGHT,"landing");
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            }
-        }
-        // Wandering timer 
-        else if (Wander == STATE) {
-            if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
-                if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
-                    return;
-            }
+		// if llDialog is up, kill the listener for the dialog box.
+		if (iHandle) {
+			llOwnerSay("Menu timed out");
+			llListenRemove(iHandle);
+			iHandle = 0;
+			return;             // ^^^^^^^^^^^^^^^^^^^^^^^
+		}
+		// if NoBodyHome, we are sensing for an avatar
+		else if (NobodyHome == STATE) {
+			ProcessSensor();
+			return;
+		}
+		// if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
+		else if (Spawning == STATE) {
+			STATE = NULL;
+			TimerEvent(TIMER);
+		}
+		// We end aniamtions with a timer
+		else if (Animate == STATE){
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+		}
 
-            // see if wander counter == 0, if so, stop walking, go to stand and process next line
-            if(RAMwc == 0) {
-                NPCAnimate(STAND);
-                DEBUG("Wander ended, calling DoProcessNPCLine");
-                STATE = NULL;
-                return;
-            }
-            // one less time to wander around
-            RAMwc--;
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-            StateWanderhold();
-            return;
-        }
-        // Wandering requires us to re-wander when we reach a destination
-        else if (WanderHold == STATE) {
-            StateWander();
-            return;
-        }
-        else if (DoProcess == STATE) {
-            TimerEvent(QUICK);
-        }
+		else if (Walking == STATE) {
+			if (--iWaitCounter) {
+				DEBUG("still walking...");
+				if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
+					return;
+				}
+			}
 
-        STATE = NULL;
+			DEBUG("At Destination: " + (string) newDest);
 
-        // We always process a NPC line at end of timer.
-        DEBUG("Tick end, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-    }
+			// walk, fly, run, land
+			if (walkstate == 1) {
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 2)  {
+					// nothing
+				} else if (walkstate == 3) {
+						NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 4) {
+					llShout(FLIGHT,"landing");
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			}
+		}
+		// Wandering timer
+		else if (Wander == STATE) {
+			if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
+				if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
+					return;
+			}
 
-    // sensors are used for sitting on prims
-    // Neo Cortex: added different states to trigger sit or touch
-    sensor(integer num) {
-        if (Sit == STATE ) {
-            osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
-            DEBUG("Seated, calling DoProcessNPCLine");
-            
-            STATE = 0;
-        } else if (Touch == STATE) {
-            osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
-            DEBUG("Touched, calling DoProcessNPCLine");
-            STATE = 0;
-        }
-        DoProcessNPCLine();
-    }
-    no_sensor(){
-        DEBUG ("no target prim located, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-        STATE = NULL;
-    }
+			// see if wander counter == 0, if so, stop walking, go to stand and process next line
+			if(RAMwc == 0) {
+				NPCAnimate(STAND);
+				DEBUG("Wander ended, calling DoProcessNPCLine");
+				STATE = NULL;
+				return;
+			}
+			// one less time to wander around
+			RAMwc--;
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+			StateWanderhold();
+			return;
+		}
+		// Wandering requires us to re-wander when we reach a destination
+		else if (WanderHold == STATE) {
+			StateWander();
+			return;
+		}
+		else if (DoProcess == STATE) {
+			TimerEvent(QUICK);
+		}
+
+		STATE = NULL;
+
+		// We always process a NPC line at end of timer.
+		DEBUG("Tick end, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+	}
+
+	// sensors are used for sitting on prims
+	// Neo Cortex: added different states to trigger sit or touch
+	sensor(integer num) {
+		if (Sit == STATE ) {
+			osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
+			DEBUG("Seated, calling DoProcessNPCLine");
+
+			STATE = 0;
+		} else if (Touch == STATE) {
+				osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
+			DEBUG("Touched, calling DoProcessNPCLine");
+			STATE = 0;
+		}
+		DoProcessNPCLine();
+	}
+	no_sensor(){
+		DEBUG ("no target prim located, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+		STATE = NULL;
+	}
+
+
+	link_message(integer sender, integer num, string str, key id){
+		if (num == 0)
+			ParseMsg(str);
+	}
 
-    
-    link_message(integer sender, integer num, string str, key id){
-        if (num == 0)
-            ParseMsg(str);
-    }
-        
 }
 
 // __ END__
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script v 4.6.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script v 4.6.lsl
index 9449a25e..ecc3adac 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script v 4.6.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Object/NPC Recorder Script v 4.6.lsl	
@@ -43,7 +43,7 @@
 // Rev 3.4 animation timer cannot be zero or it shuts off timer tweaked
 //         solves the NPC starting up when no sensor is set.
 // Rev 3.5 fixes saving to !Path  notecard
-// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted 
+// Rev 3.6 08-11-2015 @delete acts like @stop. TYjhe NPC now rezzes after an @go back in where it was deleted
 // Rev 3.7 08-11-2015 @attach command added to load an attachment from the inventory to the NPC
 // Rev 3.8 08-17-2015 process queued commands one at a time without calling ProcessNPCLine on link message
 // Rev 3.9 08-23-2011 Queued command fixes including @delete which were not always working
@@ -77,11 +77,11 @@
 // Merged with new Route recorder and notecard writer
 // If the NPC failed to reach a destination it never moved on.
 // Added WAIT global to tune this
-// Exposed many tunable variables and ported the code 
+// Exposed many tunable variables and ported the code
 // Added floating point to times in notecard.
 // Added @sound, @randsound, @whisper, @shout, and @cmd controls.
 // notecards integers are not floats for better control
-// 
+//
 // Link Messages may be used to perform external control by injecting @commands into the stream of actions
 // Example:
 // To chat something, such as with a chat robot
@@ -99,7 +99,7 @@
 //    Enabled = true
 //
 // and then the server has to be restarted.
-// please note that there are better ways to enable NPC in the latest Opensim.  
+// please note that there are better ways to enable NPC in the latest Opensim.
 
 // Commands: All commands begin with an @ sign.  All other lines are ignored
 // @commands may have optional parameters.  The syntax is always:
@@ -134,7 +134,7 @@
 //@attach     InventoryName               attachmentPoint         load an attachment from the inventory to the NPC onto point
 //@teleport   destination (vector)        NaN                     Makes the NPC teleport to destination in the same sim.  They cannot tp to another sim or across the HG
 //@reset      NaN                         NaN                     Deletes the NPC, starts the !Path notecard over.
- 
+
 // Constant            attachmentPoint Comment
 // ATTACH_CHEST            1    chest/sternum
 // ATTACH_HEAD             2    head
@@ -178,15 +178,15 @@
 // ATTACH_AVATAR_CENTER  40    avatar center/root
 
 
-  
+
 //////////////////////////////////////////////////////////
 //                  DEBUG                               //
 //////////////////////////////////////////////////////////
 integer debug = TRUE;         // set to TRUE or FALSE for debug chat on various actions
 integer LSLEditor = FALSE;        // set to to TRUE to working in  LSLEditor, FALSE for in-world.
-                              // you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
+// you must also include the NPC commands found in the other script since LSLEditor does not support OpenSim
 integer iTitleText = FALSE;    // set to TRUE to see debug info in text above the controller
- 
+
 //////////////////////////////////////////////////////////
 //                  TUNABLE CONFIGURATION               //
 //////////////////////////////////////////////////////////
@@ -209,9 +209,9 @@ string    WALK = "Walk";       // the name of the default Walk animation
 string    FLY = "Fly";        // the name of the default Fly animation
 string    RUN = "Run";        // the name of the default Run animation
 string    LAND = "Land";      // the name of the default land animation ( for birds only)
-float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.  
+float     OffsetZ = 0.5;      // appear 0.5 meter above ground, this is added to all destinations to keep them from sinking in.
 float    SPEEDMULT =0.8;     // 1.0 = regular avatar speed. Smaller numbers slow down walks. Large numbers speed them up.
-integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing" 
+integer  FLIGHT = 299;        // For controlling wings.  A channel that is shouted at when flight starts and ends. "flying" or "landing"
 
 // DESCRIPTIONS FIELDS HAVE TO SURVIVE A RESET
 //  These vars are stored  by saving them with KeyValueSet
@@ -265,7 +265,7 @@ list lMenu3 = ["<<<","@notecard","@appearance", "@touch", "@speed",       "@atta
 string sCommand;  // place to store a command for two-prompted ones
 string sParam2;   // place to store a prompt for two-prompted ones
 string priPub = "Owner Only";    // Private or Group
-key kUserKey;        // the person who is controlling the avatar, not the Owner  
+key kUserKey;        // the person who is controlling the avatar, not the Owner
 // the command lists
 list lCommands;  // commands are stored here
 list lNpcCommandList; // Storage for the NPC script.
@@ -312,712 +312,712 @@ list Stack ;              // a command stack from link message input
 
 TimerEvent(float timesent)
 {
-    if (LSLEditor)
-        timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
-        
-    DEBUG("Setting  timer: " + (string) timesent);
-    llSetTimerEvent(timesent);
+	if (LSLEditor)
+		timesent *= 5;   // slow thinggs doen when the LSLEDITOR is in use
+
+	DEBUG("Setting  timer: " + (string) timesent);
+	llSetTimerEvent(timesent);
 }
 
 // for 4.1 parse a message from a Listen or a Link message
 ParseMsg(string str) {
-    DEBUG("Command In:" + str);
-    if (str=="@go") {
-        SetStop(FALSE); // Let's run the notecard
-        DEBUG("@go running");
-        DoProcessNPCLine();
-    } else {
-        Stack += [str];    // take anything, the controller will filter away non @ stuff
-        if (STATE == NULL)
-            DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
-    }
+	DEBUG("Command In:" + str);
+	if (str=="@go") {
+		SetStop(FALSE); // Let's run the notecard
+		DEBUG("@go running");
+		DoProcessNPCLine();
+	} else {
+			Stack += [str];    // take anything, the controller will filter away non @ stuff
+		if (STATE == NULL)
+			DoProcessNPCLine(); // v 4.5 remove wait for STATE == 0
+	}
 }
 
 SetStop(integer what)
 {
-    DEBUG("Stopped set to " + (string ) what);
-    Stopped = what;
+	DEBUG("Stopped set to " + (string ) what);
+	Stopped = what;
 }
 // Do* functions are much like states from the old V2 scripts.
-    
+
 // Save a Path notecard
 DoSave()
-{ 
-    STATE = MakeNotecard;
-    makeText("Stand where you want the NPC to appear, and enter the NPC Name");
+{
+	STATE = MakeNotecard;
+	makeText("Stand where you want the NPC to appear, and enter the NPC Name");
 }
 
 // This function is used to record the path for the NPC
 // Each command can take 0, 1, or 2 params
 DoMenuForCommands() {
-    makeMenu(lAtButtons);
+	makeMenu(lAtButtons);
 }
 
 
 // No one is here when sensors were on, so we kill off the NPC
 DoNobodyHome()
 {
-    DEBUG("Nobody Home");
-    STATE = NobodyHome;
-    if (NPCKey() != NULL_KEY) {
-        osNpcRemove(NPCKey());
-        SaveKey(NULL_KEY);
-    }
-    TimerEvent(5);  // keep ticking to sense avatars   
+	DEBUG("Nobody Home");
+	STATE = NobodyHome;
+	if (NPCKey() != NULL_KEY) {
+		osNpcRemove(NPCKey());
+		SaveKey(NULL_KEY);
+	}
+	TimerEvent(5);  // keep ticking to sense avatars
 }
 
 
 ///////////////////////  STATELIKE BEHAVIOUR  /////////////
-// these StateXX functions need to wait on a timer to fire. 
+// these StateXX functions need to wait on a timer to fire.
 
 // Create a NPC
 StateSpawn() {
-    DEBUG("state spawn " + sNPCName);
-     
-    NPCEnabled = TRUE; //  in world
-    // see if there is already one out there.
-    if (NPCKey() != NULL_KEY) {
-        DEBUG("Already living");
-        return;
-    }
-    
-    STATE = Spawning;        
-    list name = llParseString2List(sNPCName, [" "], []);
-   
-    vector vRezPos = vInitialPos;
-    if (relAbs == "Relative"){
-        vRezPos += llGetPos();
-    }
+	DEBUG("state spawn " + sNPCName);
 
-   // llSay(0,llDumpList2String(name,",")); 
+	NPCEnabled = TRUE; //  in world
+	// see if there is already one out there.
+	if (NPCKey() != NULL_KEY) {
+		DEBUG("Already living");
+		return;
+	}
 
-    DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
-    key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+	STATE = Spawning;
+	list name = llParseString2List(sNPCName, [" "], []);
 
-    llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
-    SaveKey(aKey); // save in description and global, too
-    
-    osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
-    TimerEvent(REZTIME);
-    NPCAnimate(STAND);
+	vector vRezPos = vInitialPos;
+	if (relAbs == "Relative"){
+		vRezPos += llGetPos();
+	}
+
+	// llSay(0,llDumpList2String(name,","));
+
+	DEBUG("Rezzing NPC name " +llList2String(name, 0)+ llList2String(name, 1) + " at "+ (string) vRezPos);
+	key aKey = osNpcCreate(llList2String(name, 0), llList2String(name, 1), vRezPos, Appearance, NPCOptions);
+
+	llMessageLinked(LINK_SET,keyNum,"",aKey);    // bboradcast the key on num = -1
+	SaveKey(aKey); // save in description and global, too
+
+	osSetSpeed(aKey,SPEEDMULT);   // 1.9 speed multiplier
+	TimerEvent(REZTIME);
+	NPCAnimate(STAND);
 }
 
 StateSit() {
-    DEBUG ("state sit - looking for " + RAMsit);
-    STATE=Sit;
-    llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state sit - looking for " + RAMsit);
+	STATE=Sit;
+	llSensor(RAMsit, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
 
 StateTouch() {
-    DEBUG ("state touch - looking for " + RAMtouch);
-    STATE = Touch;
-    llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
+	DEBUG ("state touch - looking for " + RAMtouch);
+	STATE = Touch;
+	llSensor(RAMtouch, "", PASSIVE|ACTIVE|SCRIPTED,  96, PI);
 }
- 
+
 DoStand() {
-    DEBUG("state stand");
-    osNpcStand(NPCKey());
+	DEBUG("state stand");
+	osNpcStand(NPCKey());
 }
 
 
 StateAnimate() {
-    
-    DEBUG("state animate");
-    STATE = Animate;
-    NPCAnimate(RAManimationName);
-    if (RAManimationTime <=0 )    // V 3.4 tweak
-        RAManimationTime = 1;
-    TimerEvent(RAManimationTime);
+
+	DEBUG("state animate");
+	STATE = Animate;
+	NPCAnimate(RAManimationName);
+	if (RAManimationTime <=0 )    // V 3.4 tweak
+		RAManimationTime = 1;
+	TimerEvent(RAManimationTime);
 }
-    
+
 StateWalk() {
 
-    DEBUG("Start Walk");
-    //DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
-    STATE = Walking;
-            
-    // walk, fly, run, land
-   if (walkstate == 1) {
-        NPCAnimate(WALK);
-    } else if (walkstate == 2)  {
-        llShout(FLIGHT,"flying");
-        NPCAnimate(FLY);
-    } else if (walkstate == 3) {
-        NPCAnimate(RUN);
-    } else if (walkstate == 4) {
-        NPCAnimate(LAND);
-    } 
-    newDest = vDestPos ;
-    newDest.z += OffsetZ;
-        
-    // notecard is stored as offsets from this box with relative addressing.  Convert to absolute
-    if (relAbs == "Relative"){
-        newDest += llGetPos();
-    }
+	DEBUG("Start Walk");
+	//DEBUG("NPCWalkOption = " + (string) NPCWalkOption);
+	STATE = Walking;
 
-    DEBUG("Moveto:" + (string) newDest);
-    osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);
+	// walk, fly, run, land
+	if (walkstate == 1) {
+		NPCAnimate(WALK);
+	} else if (walkstate == 2)  {
+			llShout(FLIGHT,"flying");
+		NPCAnimate(FLY);
+	} else if (walkstate == 3) {
+			NPCAnimate(RUN);
+	} else if (walkstate == 4) {
+			NPCAnimate(LAND);
+	}
+	newDest = vDestPos ;
+	newDest.z += OffsetZ;
+
+	// notecard is stored as offsets from this box with relative addressing.  Convert to absolute
+	if (relAbs == "Relative"){
+		newDest += llGetPos();
+	}
+
+	DEBUG("Moveto:" + (string) newDest);
+	osNpcMoveToTarget(NPCKey(), newDest, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 
 StateWander(){
-    DEBUG("state wander");
-    STATE = Wander;
-    
-    vector point = CirclePoint(RAMwd);
-    DEBUG("CirclePoint:" + (string) point);
-    vWanderPos = vDestPos + point;
-    DEBUG("vWanderPos:" + (string) vWanderPos);
+	DEBUG("state wander");
+	STATE = Wander;
 
-    fTimerVal = WANDERTIME;    // default time to pause after each wander
-    if (WANDERRAND)
-        fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
+	vector point = CirclePoint(RAMwd);
+	DEBUG("CirclePoint:" + (string) point);
+	vWanderPos = vDestPos + point;
+	DEBUG("vWanderPos:" + (string) vWanderPos);
 
-    NPCAnimate(WALK);
+	fTimerVal = WANDERTIME;    // default time to pause after each wander
+	if (WANDERRAND)
+		fTimerVal = llFrand(WANDERTIME) + 1;    // override, they want random times
 
-    DEBUG("Wander to:" + (string) vWanderPos);
+	NPCAnimate(WALK);
 
-    osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
-    iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
-    TimerEvent(TIMER);      
+	DEBUG("Wander to:" + (string) vWanderPos);
+
+	osNpcMoveToTarget(NPCKey(), vWanderPos, NPCWalkOption);
+	iWaitCounter = WAIT;            // wait 60 seconds to get to a destination.
+	TimerEvent(TIMER);
 }
 
 StateWanderhold() {
 
-    DEBUG("Wander Hold");
-    STATE = WanderHold;
-       
-     // now that we have reached a wander spot, slow the timer down to the desired value
-    TimerEvent(fTimerVal);
+	DEBUG("Wander Hold");
+	STATE = WanderHold;
+
+	// now that we have reached a wander spot, slow the timer down to the desired value
+	TimerEvent(fTimerVal);
 }
 
 
- 
+
 DoRotate() {
-    DEBUG("@rotate=" + (string) RAMrot); 
-    osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
-}  
+	DEBUG("@rotate=" + (string) RAMrot);
+	osNpcSetRot(NPCKey(), llEuler2Rot(<0,0,RAMrot> * DEG_TO_RAD));
+}
 
 
 
 // @pause=10 will do nothing for 10 seconds
 DoPause() {
-    STATE = Paused;
-    if (RAMPause < 0.1)
-        RAMPause = 0.1;
-    DEBUG("@pause=" + (string)RAMPause);
-    TimerEvent(RAMPause);
+	STATE = Paused;
+	if (RAMPause < 0.1)
+		RAMPause = 0.1;
+	DEBUG("@pause=" + (string)RAMPause);
+	TimerEvent(RAMPause);
 }
 
 
 // @stop makes the NPC stop moving in whatever state it is in.  You have to linkmessage to get moving again
-DoStop() {    
-    DEBUG("NPC is Stopped");
-    STATE   = 0;    // accept commands
-    SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-    TimerEvent(0);
-    Stack = []; // v3.8
+DoStop() {
+	DEBUG("NPC is Stopped");
+	STATE   = 0;    // accept commands
+	SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+	TimerEvent(0);
+	Stack = []; // v3.8
 }
-    
+
 // @delete removes the NPC forever. Next command starts it up again at the beginning
 DoDelete() {
-    DEBUG("state delete");
-    osNpcRemove(NPCKey());
-    SaveKey(NULL_KEY);
-    TimerEvent(0);
-    Stack = []; // v3.8
-    STATE = NULL;    // accept commands
+	DEBUG("state delete");
+	osNpcRemove(NPCKey());
+	SaveKey(NULL_KEY);
+	TimerEvent(0);
+	Stack = []; // v3.8
+	STATE = NULL;    // accept commands
 }
 
 // change the appearance of the NPC
 DoAppearance(string notecard) {
-    DEBUG("state appearance");
-    if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
-        DEBUG("Load appearance " + notecard);
-        osNpcLoadAppearance(NPCKey(),notecard);
-    }
-    STATE = NULL;    // accept commands
+	DEBUG("state appearance");
+	if (llGetInventoryType(notecard) == INVENTORY_NOTECARD){
+		DEBUG("Load appearance " + notecard);
+		osNpcLoadAppearance(NPCKey(),notecard);
+	}
+	STATE = NULL;    // accept commands
 }
 
 // Change the avatar speed
 DoSpeed(string speed) {
-    float newspeed = (float) speed;
-    if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
-        osSetSpeed(NPCKey(),newspeed);
-    }
-    STATE = NULL;    // accept commands
+	float newspeed = (float) speed;
+	if (newspeed > 0.1 && newspeed < 5.0) {// sanity check
+		osSetSpeed(NPCKey(),newspeed);
+	}
+	STATE = NULL;    // accept commands
 }
 
 DoTeleport(string params) {
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    vector Dest = (vector) itemName;
-    if (Dest != ZERO_VECTOR) {
-        if (relAbs == "Relative"){
-            Dest += llGetPos();
-        }
-        osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
-        
-    } else {
-        llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
-    }
-    STATE = NULL;    // accept commands
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	vector Dest = (vector) itemName;
+	if (Dest != ZERO_VECTOR) {
+		if (relAbs == "Relative"){
+			Dest += llGetPos();
+		}
+		osTeleportAgent( NPCKey(), llGetRegionName(), Dest, ZERO_VECTOR );
+
+	} else {
+			llSay(DEBUG_CHANNEL,"Attempt to teleport to <0,0,0> probably not what you intended: @teleport=<vector>");
+	}
+	STATE = NULL;    // accept commands
 }
 
 
 
 DoNewNote (string card) {
-    DEBUG("Load Notecard " + card);    
-    NPCReadNoteCard(card);
-    SetStop(FALSE);
-    STATE = NULL;    // accept commands
+	DEBUG("Load Notecard " + card);
+	NPCReadNoteCard(card);
+	SetStop(FALSE);
+	STATE = NULL;    // accept commands
 }
 DoAttach(string params) {
-    
-    list Data = llParseString2List(params, ["|"], []);
-    string itemName = llList2String(Data, 0);
-    integer attachmentPoint  = (integer) llList2String(Data, 1);
-    if (attachmentPoint > 0
-        && attachmentPoint < 40
-        && llGetInventoryType(itemName) == INVENTORY_OBJECT
-       )
-    {
-        osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
-    }
-    STATE = NULL;    // accept commands
+
+	list Data = llParseString2List(params, ["|"], []);
+	string itemName = llList2String(Data, 0);
+	integer attachmentPoint  = (integer) llList2String(Data, 1);
+	if (attachmentPoint > 0
+		&& attachmentPoint < 40
+			&& llGetInventoryType(itemName) == INVENTORY_OBJECT
+				)
+				{
+					osForceAttachToOtherAvatarFromInventory(NPCKey(),itemName,attachmentPoint);
+				}
+	STATE = NULL;    // accept commands
 }
 
 // This loops over the notecard, processing each command
 DoProcessNPCLine() {
-    DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
-    
-    STATE = DoProcess;
-    
-        // auto load a notecard
-    if (! llGetListLength(lNpcCommandList)) {
-        DEBUG("Read Notecard");
-        NPCReadNoteCard(Notecard);
-    }
+	DEBUG("ProcessNPCLine, stopped = " + (string) Stopped);
 
-    // look for link messages on the stack
-    string next = llList2String(Stack,0);    // lets see if there is anything from a link message
-    if (llStringLength(next))
-    {
-        Stack = llDeleteSubList(Stack,0,0);
-        ProcessCmd(next);        //lets do this command instead.
-        return;
-    }
+	STATE = DoProcess;
 
-    // @stop issued?
-    if (Stopped) {
-        TimerEvent(0);
-        DEBUG("Stopped, waiting for input");
-        STATE = NULL;
-        return;
-    }
+	// auto load a notecard
+	if (! llGetListLength(lNpcCommandList)) {
+		DEBUG("Read Notecard");
+		NPCReadNoteCard(Notecard);
+	}
 
-    // No, we have an @go for liftoff
-    next = llList2String(lNpcCommandList, 0);        // get the next command
-    DEBUG("Execute:" + next);
-    lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
-        
-    if (llGetListLength(lNpcCommandList) == 0) {
-        DEBUG("EOF");
-    }
-    ProcessCmd(next);
-} 
+	// look for link messages on the stack
+	string next = llList2String(Stack,0);    // lets see if there is anything from a link message
+	if (llStringLength(next))
+	{
+		Stack = llDeleteSubList(Stack,0,0);
+		ProcessCmd(next);        //lets do this command instead.
+		return;
+	}
+
+	// @stop issued?
+	if (Stopped) {
+		TimerEvent(0);
+		DEBUG("Stopped, waiting for input");
+		STATE = NULL;
+		return;
+	}
+
+	// No, we have an @go for liftoff
+	next = llList2String(lNpcCommandList, 0);        // get the next command
+	DEBUG("Execute:" + next);
+	lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);      // delete it
+
+	if (llGetListLength(lNpcCommandList) == 0) {
+		DEBUG("EOF");
+	}
+	ProcessCmd(next);
+}
 
 
 
 ProcessCmd(string cmd) {
 
-    DEBUG("ProcessCmd:" + cmd);
+	DEBUG("ProcessCmd:" + cmd);
 
-    llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
-    if (llGetSubString(cmd, 0, 0) != "@") {
-        DEBUG("ignoring");
-        TimerEvent(QUICK);  // this is so we do not recurse the stack
-        STATE = NULL;
-        return;
-    }
+	llMessageLinked(LINK_SET,keyNum,"",NPCKey());    // bboradcast the key on num = -1
+	if (llGetSubString(cmd, 0, 0) != "@") {
+		DEBUG("ignoring");
+		TimerEvent(QUICK);  // this is so we do not recurse the stack
+		STATE = NULL;
+		return;
+	}
 
-    list data  = llParseString2List(cmd, ["="], []);
-    npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
+	list data  = llParseString2List(cmd, ["="], []);
+	npcAction = llToLower(llStringTrim(llList2String(data, 0), STRING_TRIM));
 
-    DEBUG("Action:" + npcAction);
-    npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
-    DEBUG("Params:" + npcParams);
-    
-    @commands;
+	DEBUG("Action:" + npcAction);
+	npcParams = llStringTrim(llList2String(data, 1), STRING_TRIM);
+	DEBUG("Params:" + npcParams);
 
-    ProcessSensor();
-    
-    if(npcAction == "@spawn") {
-        DEBUG("@spawn npcParams ");
-        list spawnData = llParseString2List(npcParams, ["|"], []);
-        sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
+	@commands;
 
-        vInitialPos = (vector) llList2String(spawnData, 1);        
-        DEBUG("Coords for NPC at " + (string) vInitialPos);
-        StateSpawn();
-        return;
-    }
-    
-     if (! avatarPresent){
-        DoNobodyHome();
-        DEBUG("No avatar nearby");
-        STATE = NULL;
-        return;
-    } else {
-        if ( NPCKey() == NULL_KEY) {
-            StateSpawn();
-        }
-    }
+	ProcessSensor();
 
-    
-    
-    
-    if(npcAction == "@stop") {
-        DoStop();
-        STATE = NULL;
-        return;
-    }
-    else if(npcAction == "@goto") {
-        DEBUG("goto");
-        integer lastIdx = llGetListLength(lNpcCommandList)-1;
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
-        // Wind commands till goto label.
-        @wind;
-        string next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        if(next1 != npcParams) jump wind;
-        // Wind the label too.
-        next1 = llList2String(lNpcCommandList, 0);
-        lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
-        lNpcCommandList += next1;
-        // Get next command.
-        list data1  = llParseString2List(next1, ["="], []);
-        npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
-        npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
-        // Reschedule.
-        jump commands;
-    }
-    else if(npcAction == "@sound") {
-        DEBUG("sound");
-        llTriggerSound(npcParams,1.0);
-    }
-    else if(npcAction == "@randsound") {
-        DEBUG("@randsound");
-        integer N = llGetInventoryNumber(INVENTORY_SOUND);
-        integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
-        string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
-        llTriggerSound(toPlay,1.0);
-    }
-    else if(npcAction == "@walk") {
-        DEBUG("@walk");
-        GetDest(npcParams);
-        walkstate = 1;//  walking
-        NPCWalkOption = OS_NPC_NO_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@fly") {
-        GetDest(npcParams);
-        walkstate = 2;//  flying
-        NPCWalkOption = OS_NPC_FLY ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@run") {
-        DEBUG("@run");
-        GetDest(npcParams);
-        walkstate = 3;//  running
-        NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@land") {
-        DEBUG("@land");
-        GetDest(npcParams);
-        walkstate = 4;//  landing
-        NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
-        StateWalk();
-        return;
-    }
-    else if(npcAction == "@say") {
-        DEBUG("@say " + npcParams);
-        osNpcSay(NPCKey(), 0, npcParams);
-    }
-    else if(npcAction == "@shout") {
-        DEBUG("@shout");
-        osNpcShout(NPCKey(),0, npcParams);
-    }
-    else if(npcAction == "@whisper") {
-        DEBUG("@whisper " + npcParams);
-        osNpcWhisper(NPCKey(),0, npcParams);
-    }
-    // speak a command on a channel, so you can open doors and control stuff.
-    else if(npcAction == "@cmd") {
-        DEBUG("@cmd");
-        list dataToSpeak = llParseString2List(npcParams, ["|"], []);
-        string channel = llList2String(dataToSpeak,0);
-        DEBUG("Channel:"+(string) channel);
-        integer iChannel = (integer) channel;
-        string stringToSpeak = llList2String(dataToSpeak,1);
-        llSay(iChannel, stringToSpeak);
-    }
-    // stop everything
-    else if(npcAction == "@pause") {
-        RAMPause = (float) npcParams;
-        DoPause();
-        return;
-    }
-    else if(npcAction == "@wander") {
-        list wanderData = llParseString2List(npcParams, ["|"], []);
-        RAMwd = (float) llList2String(wanderData, 0);
-        RAMwc = (integer) llList2String(wanderData, 1);
-        vDestPos = osNpcGetPos(NPCKey());        // set the wander start
-        DEBUG("Starting at " + (string) vDestPos);
-        StateWander();
-        return;
-    }
-    else if(npcAction == "@rotate") {
-        RAMrot = (float) npcParams;
-        DoRotate();
-    }
-    else if(npcAction == "@sit") {
-        RAMsit= npcParams;
-        StateSit();
-        return;
-    }
-    else if(npcAction == "@touch") {
-        RAMtouch= npcParams;
-        StateTouch();
-        return;
-    }
-    else  if(npcAction == "@stand") {
-        DoStand();
-    }
-    else if(npcAction == "@delete") {
-        DoDelete();
-        SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
-        return;
-    }
-    else if(npcAction == "@animate") {
-        list animateData = llParseString2List(npcParams, ["|"], []);
-        RAManimationName = llList2String(animateData, 0);
-        RAManimationTime = (float) llList2String(animateData, 1);
-        StateAnimate();
-        return;
-    }
-    else if(npcAction == "@appearance" ){
-        DoAppearance(npcParams);
-    }
-    else if (npcAction =="@speed") {
-        DoSpeed(npcParams);
-    }
-    else if (npcAction =="@notecard") {      
-        DoNewNote(npcParams);
-        Notecard = npcParams;
-    }
-    else if (npcAction == "@attach")
-    {
-        DoAttach(npcParams);
-    }
-    else if (npcAction == "@teleport")
-    {
-        DoTeleport(npcParams);
-    }
-    else if (npcAction == "@reset")
-    {
-        DoDelete();
-        SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
-    }
+	if(npcAction == "@spawn") {
+		DEBUG("@spawn npcParams ");
+		list spawnData = llParseString2List(npcParams, ["|"], []);
+		sNPCName =llList2String(spawnData, 0);    // V 1.6 name in RAM
 
-    STATE = NULL;
-    TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack 
+		vInitialPos = (vector) llList2String(spawnData, 1);
+		DEBUG("Coords for NPC at " + (string) vInitialPos);
+		StateSpawn();
+		return;
+	}
+
+	if (! avatarPresent){
+		DoNobodyHome();
+		DEBUG("No avatar nearby");
+		STATE = NULL;
+		return;
+	} else {
+			if ( NPCKey() == NULL_KEY) {
+				StateSpawn();
+			}
+	}
+
+
+
+
+	if(npcAction == "@stop") {
+		DoStop();
+		STATE = NULL;
+		return;
+	}
+	else if(npcAction == "@goto") {
+		DEBUG("goto");
+		integer lastIdx = llGetListLength(lNpcCommandList)-1;
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, lastIdx, lastIdx);
+		// Wind commands till goto label.
+		@wind;
+		string next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		if(next1 != npcParams) jump wind;
+		// Wind the label too.
+		next1 = llList2String(lNpcCommandList, 0);
+		lNpcCommandList = llDeleteSubList(lNpcCommandList, 0, 0);
+		lNpcCommandList += next1;
+		// Get next command.
+		list data1  = llParseString2List(next1, ["="], []);
+		npcAction = llToLower(llStringTrim(llList2String(data1, 0), STRING_TRIM));
+		npcParams = llStringTrim(llList2String(data1, 1), STRING_TRIM);
+		// Reschedule.
+		jump commands;
+	}
+	else if(npcAction == "@sound") {
+		DEBUG("sound");
+		llTriggerSound(npcParams,1.0);
+	}
+	else if(npcAction == "@randsound") {
+		DEBUG("@randsound");
+		integer N = llGetInventoryNumber(INVENTORY_SOUND);
+		integer rand = llCeil(llFrand(N)) -1;    // pick a random sound
+		string toPlay = llGetInventoryName(INVENTORY_SOUND,rand);
+		llTriggerSound(toPlay,1.0);
+	}
+	else if(npcAction == "@walk") {
+		DEBUG("@walk");
+		GetDest(npcParams);
+		walkstate = 1;//  walking
+		NPCWalkOption = OS_NPC_NO_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@fly") {
+		GetDest(npcParams);
+		walkstate = 2;//  flying
+		NPCWalkOption = OS_NPC_FLY ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@run") {
+		DEBUG("@run");
+		GetDest(npcParams);
+		walkstate = 3;//  running
+		NPCWalkOption = OS_NPC_NO_FLY | OS_NPC_RUNNING;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@land") {
+		DEBUG("@land");
+		GetDest(npcParams);
+		walkstate = 4;//  landing
+		NPCWalkOption= OS_NPC_FLY | OS_NPC_LAND_AT_TARGET ;
+		StateWalk();
+		return;
+	}
+	else if(npcAction == "@say") {
+		DEBUG("@say " + npcParams);
+		osNpcSay(NPCKey(), 0, npcParams);
+	}
+	else if(npcAction == "@shout") {
+		DEBUG("@shout");
+		osNpcShout(NPCKey(),0, npcParams);
+	}
+	else if(npcAction == "@whisper") {
+		DEBUG("@whisper " + npcParams);
+		osNpcWhisper(NPCKey(),0, npcParams);
+	}
+	// speak a command on a channel, so you can open doors and control stuff.
+	else if(npcAction == "@cmd") {
+		DEBUG("@cmd");
+		list dataToSpeak = llParseString2List(npcParams, ["|"], []);
+		string channel = llList2String(dataToSpeak,0);
+		DEBUG("Channel:"+(string) channel);
+		integer iChannel = (integer) channel;
+		string stringToSpeak = llList2String(dataToSpeak,1);
+		llSay(iChannel, stringToSpeak);
+	}
+	// stop everything
+	else if(npcAction == "@pause") {
+		RAMPause = (float) npcParams;
+		DoPause();
+		return;
+	}
+	else if(npcAction == "@wander") {
+		list wanderData = llParseString2List(npcParams, ["|"], []);
+		RAMwd = (float) llList2String(wanderData, 0);
+		RAMwc = (integer) llList2String(wanderData, 1);
+		vDestPos = osNpcGetPos(NPCKey());        // set the wander start
+		DEBUG("Starting at " + (string) vDestPos);
+		StateWander();
+		return;
+	}
+	else if(npcAction == "@rotate") {
+		RAMrot = (float) npcParams;
+		DoRotate();
+	}
+	else if(npcAction == "@sit") {
+		RAMsit= npcParams;
+		StateSit();
+		return;
+	}
+	else if(npcAction == "@touch") {
+		RAMtouch= npcParams;
+		StateTouch();
+		return;
+	}
+	else  if(npcAction == "@stand") {
+		DoStand();
+	}
+	else if(npcAction == "@delete") {
+		DoDelete();
+		SetStop(TRUE); // Link controlled - we mnust have a @go to continue with notecards
+		return;
+	}
+	else if(npcAction == "@animate") {
+		list animateData = llParseString2List(npcParams, ["|"], []);
+		RAManimationName = llList2String(animateData, 0);
+		RAManimationTime = (float) llList2String(animateData, 1);
+		StateAnimate();
+		return;
+	}
+	else if(npcAction == "@appearance" ){
+		DoAppearance(npcParams);
+	}
+	else if (npcAction =="@speed") {
+		DoSpeed(npcParams);
+	}
+	else if (npcAction =="@notecard") {
+		DoNewNote(npcParams);
+		Notecard = npcParams;
+	}
+	else if (npcAction == "@attach")
+	{
+		DoAttach(npcParams);
+	}
+	else if (npcAction == "@teleport")
+	{
+		DoTeleport(npcParams);
+	}
+	else if (npcAction == "@reset")
+	{
+		DoDelete();
+		SetStop(FALSE); // a @resst will restart the original !Path after deleting the notecard.
+	}
+
+	STATE = NULL;
+	TimerEvent(QUICK);  // yeah I know, not possible this fast, we just go as fast as we can go - this is so we do not recurse the stack
 }
- 
+
 
 
 /////////////////// UTILITY Functions, not state-like //////////////////
 
 // DEBUG(string) will chat a string or display it as hovertext if debug == TRUE
 DEBUG(string str) {
-    if (debug && ! LSLEditor)
-        llOwnerSay( str);                    // Send the owner debug info 
-    if (debug &&  LSLEditor)
-        llSay(0, str);                    // Send to the Console in LSLEDitor 
-    if (iTitleText) {
-        llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
-    
-    }
-} 
+	if (debug && ! LSLEditor)
+		llOwnerSay( str);                    // Send the owner debug info
+	if (debug &&  LSLEditor)
+		llSay(0, str);                    // Send to the Console in LSLEDitor
+	if (iTitleText) {
+		llSetText(str,<1.0,1.0,1.0>,1.0);    // show hovertext
+
+	}
+}
 
 GetDest(string npcParams) {
-    list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
-    vDestPos.x = llList2Float(dest, 0);
-    vDestPos.y = llList2Float(dest, 1);
-    vDestPos.z = llList2Float(dest, 2);
+	list dest = llParseString2List(npcParams, ["<", ",", ">"], []);
+	vDestPos.x = llList2Float(dest, 0);
+	vDestPos.y = llList2Float(dest, 1);
+	vDestPos.z = llList2Float(dest, 2);
 }
 
 NPCReadNoteCard(string Note) {
-    DEBUG("NPCReadNoteCard");             
-    lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
-}  
-  
+	DEBUG("NPCReadNoteCard");
+	lNpcCommandList = llParseString2List(osGetNotecard(Note), ["\n"], []);
+}
+
 integer SenseAvatar()
 {
-    //Returns a strided list of the UUID, position, and name of each avatar in the region
-    list avatars = llGetAgentList(AGENT_LIST_REGION ,[]);
-    integer numOfAvatars = llGetListLength(avatars);
-    if (numOfAvatars == 0)
-    {
-        DEBUG("No people");
-        return 0;
-    }
-    //DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's"); 
-        
-    integer nAvatars;
-    integer i;
-    for( i = 0;i < numOfAvatars; i++) {
-        key aviKey = llList2Key(avatars,i);
-        if (!osIsNpc(aviKey)) {
-            list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
-            vector pos = llList2Vector(detail,0);
-            float dist = llVecDist(pos, llGetPos());
-            if (dist  < RANGE)
-            {
-                nAvatars++;
-                DEBUG("In range:" + llKey2Name(aviKey));
-            }
-        }
-    }
-    //DEBUG("Located " + (string) nAvatars + " avatars");
-    return nAvatars;
-} 
- 
+	//Returns a strided list of the UUID, position, and name of each avatar in the region
+	list avatars = llGetAgentList(AGENT_LIST_REGION ,[]);
+	integer numOfAvatars = llGetListLength(avatars);
+	if (numOfAvatars == 0)
+	{
+		DEBUG("No people");
+		return 0;
+	}
+	//DEBUG("Located " + (string)numOfAvatars + " avatars and NPC's");
+
+	integer nAvatars;
+	integer i;
+	for( i = 0;i < numOfAvatars; i++) {
+		key aviKey = llList2Key(avatars,i);
+		if (!osIsNpc(aviKey)) {
+			list detail = llGetObjectDetails(aviKey,[OBJECT_POS]);
+			vector pos = llList2Vector(detail,0);
+			float dist = llVecDist(pos, llGetPos());
+			if (dist  < RANGE)
+			{
+				nAvatars++;
+				DEBUG("In range:" + llKey2Name(aviKey));
+			}
+		}
+	}
+	//DEBUG("Located " + (string) nAvatars + " avatars");
+	return nAvatars;
+}
+
 // return TRUE if the avatar is owner when private is set, or TRUE if the avatar is in the same group and GROUP is set.
 integer checkPerms() {
 
-    integer group = (integer) KeyValueGet("pr");
-    if (! group)
-        priPub = "Owner Only";
-    else
-        priPub = "Group";
-    
-    
-    if (llDetectedKey(0) == llGetOwner()){
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
- 
-    if ( group && llDetectedGroup(0)) {
-        kUserKey = llDetectedKey(0);
-        return TRUE;
-    }
-    kUserKey = llDetectedKey(0);
-    return FALSE;
+	integer group = (integer) KeyValueGet("pr");
+	if (! group)
+		priPub = "Owner Only";
+	else
+		priPub = "Group";
+
+
+	if (llDetectedKey(0) == llGetOwner()){
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+
+	if ( group && llDetectedGroup(0)) {
+		kUserKey = llDetectedKey(0);
+		return TRUE;
+	}
+	kUserKey = llDetectedKey(0);
+	return FALSE;
 }
 
 
 
 NPCAnimate(string anim)
 {
-    DEBUG("Start Anim: " + anim);
-    if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
-        
-        if (lastANIM != anim) {
-            if(llStringLength(lastANIM)) {
-                osNpcStopAnimation(NPCKey(), lastANIM);  
-            }
-            osNpcPlayAnimation(NPCKey(), anim);
-            lastANIM = anim;
-        }            
-    } else {
-        llSay(DEBUG_CHANNEL, "No animation named " + anim);
-    }
-} 
+	DEBUG("Start Anim: " + anim);
+	if (llGetInventoryType(anim) == INVENTORY_ANIMATION ) {
+
+		if (lastANIM != anim) {
+			if(llStringLength(lastANIM)) {
+				osNpcStopAnimation(NPCKey(), lastANIM);
+			}
+			osNpcPlayAnimation(NPCKey(), anim);
+			lastANIM = anim;
+		}
+	} else {
+			llSay(DEBUG_CHANNEL, "No animation named " + anim);
+	}
+}
 
 // Kill a NPC by Name
 Kill(string param)
 {
-    integer count;
-    list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\    
-    integer i;
-    integer j = llGetListLength(avatars);
-    for (i=0 ; i <= j; i+=3){
-        
-        string desired = llList2String(avatars,i+2);
-        desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
-        
-        if (desired == param){
-            vector v = llList2Vector(avatars,i+1);
-            key target = llList2Key(avatars,i);    // get the UUID of the avatar
-            osNpcRemove(target);
-            
-            llOwnerSay("Removed " + param+ " at  location " + (string) v);
-            count++;
-        }
-    }
-    
-    NPCEnabled = FALSE; // not in world
-    SaveKey(NULL_KEY );    // Rev 4.4
-    
-    if (count)
-        llOwnerSay("Removed " + (string) count + " NPC's");
-    else
-        llOwnerSay("Could not locate " + param);
+	integer count;
+	list avatars = osGetAvatarList(); // Returns a strided list of the UUID, position, and name of each avatar in the region except the owner.\
+	integer i;
+	integer j = llGetListLength(avatars);
+	for (i=0 ; i <= j; i+=3){
+
+		string desired = llList2String(avatars,i+2);
+		desired = llStringTrim(desired,STRING_TRIM);    // should not be needed but is needed
+
+		if (desired == param){
+			vector v = llList2Vector(avatars,i+1);
+			key target = llList2Key(avatars,i);    // get the UUID of the avatar
+			osNpcRemove(target);
+
+			llOwnerSay("Removed " + param+ " at  location " + (string) v);
+			count++;
+		}
+	}
+
+	NPCEnabled = FALSE; // not in world
+	SaveKey(NULL_KEY );    // Rev 4.4
+
+	if (count)
+		llOwnerSay("Removed " + (string) count + " NPC's");
+	else
+		llOwnerSay("Could not locate " + param);
 }
 
 
 // return a String for the position we are at. Strings used as the caller wants strings
 string Pos()
 {
-    vector where = llGetPos(); // find the box position
-   
-    where.z +=    OffsetZ;  // use the ground position + an offset 
-        
-    if (LSLEditor)
-        where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
-   
-   // if attached the height will be too high by 1/2 the agent size
-    if (llGetAttached()) {
-        vector size = llGetAgentSize(llGetOwner());   
-        float Z = size.z;
-        where.z -= Z/2;  
-    }
-   
-    // DEBUG("Pos= " + (string) where);
-    return (string) where;
+	vector where = llGetPos(); // find the box position
+
+	where.z +=    OffsetZ;  // use the ground position + an offset
+
+	if (LSLEditor)
+		where  = <128,128,31 + llFrand(1)>; // force center of sim when editing
+
+	// if attached the height will be too high by 1/2 the agent size
+	if (llGetAttached()) {
+		vector size = llGetAgentSize(llGetOwner());
+		float Z = size.z;
+		where.z -= Z/2;
+	}
+
+	// DEBUG("Pos= " + (string) where);
+	return (string) where;
 }
 
 // setup a menu with a timer for timeouts, called by all make*()
 menu()
 {
-    llListenRemove(iHandle);
-    iChannel = llCeil(llFrand(100000) + 20000);
-    iHandle = llListen(iChannel,"","","");
-    TimerEvent(30.0);
-    MENU = TRUE;
+	llListenRemove(iHandle);
+	iChannel = llCeil(llFrand(100000) + 20000);
+	iHandle = llListen(iChannel,"","","");
+	TimerEvent(30.0);
+	MENU = TRUE;
 }
 
 // make a text box
 makeText(string Param)
-{ 
-    menu();
-    llTextBox(kUserKey, Param, iChannel);
+{
+	menu();
+	llTextBox(kUserKey, Param, iChannel);
 }
 
 // top level menu
 makeMainMenu()
 {
-    menu();
-    list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
+	menu();
+	list buttons = ["Appearance","Recording","Save","Help","-","Erase RAM", priPub,relAbs,"-","Stop NPC",mSensor,"Start NPC"];
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Records",buttons,iChannel);
 }
 
 
@@ -1025,11 +1025,11 @@ makeMainMenu()
 // top level menu for non group/ non owners
 makeUserMenu()
 {
-    if (!allowUsers) return;
-    
-    menu();
-    list buttons = ["Start NPC","Stop NPC"];
-    llDialog(kUserKey,"Choose",buttons,iChannel);
+	if (!allowUsers) return;
+
+	menu();
+	list buttons = ["Start NPC","Stop NPC"];
+	llDialog(kUserKey,"Choose",buttons,iChannel);
 }
 
 
@@ -1037,199 +1037,199 @@ makeUserMenu()
 // programmable menu for @commands
 makeMenu(list buttons)
 {
-    menu();
-    llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
+	menu();
+	llDialog(kUserKey,(string) llGetListLength(lCommands) + " Record",buttons,iChannel);
 }
 
 
 // make one or two text boxes with prompts
 Text(string cmd, string p1, string p2)
 {
-    sCommand = cmd;
-     sParam2 = "";
-    if (llStringLength(p2))
-        sParam2 = p2;
+	sCommand = cmd;
+	sParam2 = "";
+	if (llStringLength(p2))
+		sParam2 = p2;
 
-    makeText(p1);
-} 
+	makeText(p1);
+}
 
 // Set the Avatar Present flag - if sensors are off and we are force run, there will be one present.
 ProcessSensor()
 {
-    integer SensorOn;
-    if ("on" == KeyValueGet("se"))
-    {
-        SensorOn = TRUE;        // we need to scan for avatars
-    } else {
-        SensorOn = FALSE;        // we need to scan for avatars
-    }
-    DEBUG("Sensor:" + (string) SensorOn);
-    
-    integer n = SenseAvatar();
-    
-    DEBUG("Avatars:" + (string) n);
-    if (SensorOn && n)
-        avatarPresent = TRUE;   // someone is here and we need to tell the system to run
-    else if (SensorOn && !n)
-        avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
-    else {       // sensor is off, lete see if there is a NPC. If so, we are ON 
-       // DEBUG("NPCEnabled:" + (string) NPCEnabled);
-       
-        if (NPCEnabled)
-            avatarPresent = TRUE;  
-        else
-            avatarPresent = FALSE;   
-    }
-    
-    //  start up from when when no one is near
-    if (avatarPresent && STATE == NobodyHome)
-        STATE = NULL;
-    
-    DEBUG("Avatar Present: " + (string) avatarPresent);
+	integer SensorOn;
+	if ("on" == KeyValueGet("se"))
+	{
+		SensorOn = TRUE;        // we need to scan for avatars
+	} else {
+			SensorOn = FALSE;        // we need to scan for avatars
+	}
+	DEBUG("Sensor:" + (string) SensorOn);
+
+	integer n = SenseAvatar();
+
+	DEBUG("Avatars:" + (string) n);
+	if (SensorOn && n)
+		avatarPresent = TRUE;   // someone is here and we need to tell the system to run
+	else if (SensorOn && !n)
+		avatarPresent = FALSE;  // someone is not here and we need to tell the system to stop
+	else {       // sensor is off, lete see if there is a NPC. If so, we are ON
+		// DEBUG("NPCEnabled:" + (string) NPCEnabled);
+
+		if (NPCEnabled)
+			avatarPresent = TRUE;
+		else
+			avatarPresent = FALSE;
+	}
+
+	//  start up from when when no one is near
+	if (avatarPresent && STATE == NobodyHome)
+		STATE = NULL;
+
+	DEBUG("Avatar Present: " + (string) avatarPresent);
 }
 
 vector CirclePoint(float radius) {
-    float x = llFrand(radius *2) - radius;        // +/- radius, randomized
-    float y = llFrand(radius *2) - radius;        // +/- radius, randomized
-    return <x, y, 0>;        // so this should always happen
+	float x = llFrand(radius *2) - radius;        // +/- radius, randomized
+	float y = llFrand(radius *2) - radius;        // +/- radius, randomized
+	return <x, y, 0>;        // so this should always happen
 }
 
 string KeyValueGet(string var) {
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k != var) jump continue;
-        //DEBUG("got " + var + " = " +  llList2String(data, 1));
-        return llList2String(data, 1);
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    return "";
-} 
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k != var) jump continue;
+		//DEBUG("got " + var + " = " +  llList2String(data, 1));
+		return llList2String(data, 1);
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	return "";
+}
 
 KeyValueSet(string var, string val) {
 
-    //DEBUG("set " + var + " = " + val);
-    list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
-    if(llGetListLength(dVars) == 0)
-    {
-        llSetObjectDesc(var + "=" + val);
-        return;
-    }
-    list result = [];
-    do {
-        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-        string k = llList2String(data, 0);
-        if(k == "") jump continue;
-        if(k == var && val == "") jump continue;
-        if(k == var) {
-            result += k + "=" + val;
-            val = "";
-            jump continue;
-        }
-        string v = llList2String(data, 1);
-        if(v == "") jump continue;
-        result += k + "=" + v;
-        @continue;
-        dVars = llDeleteSubList(dVars, 0, 0);
-    } while(llGetListLength(dVars));
-    if(val != "") result += var + "=" + val;
-    llSetObjectDesc(llDumpList2String(result, "&"));
+	//DEBUG("set " + var + " = " + val);
+	list dVars = llParseString2List(llGetObjectDesc(), ["&"], []);
+	if(llGetListLength(dVars) == 0)
+	{
+		llSetObjectDesc(var + "=" + val);
+		return;
+	}
+	list result = [];
+	do {
+		list data = llParseString2List(llList2String(dVars, 0), ["="], []);
+		string k = llList2String(data, 0);
+		if(k == "") jump continue;
+		if(k == var && val == "") jump continue;
+		if(k == var) {
+			result += k + "=" + val;
+			val = "";
+			jump continue;
+		}
+		string v = llList2String(data, 1);
+		if(v == "") jump continue;
+		result += k + "=" + v;
+		@continue;
+		dVars = llDeleteSubList(dVars, 0, 0);
+	} while(llGetListLength(dVars));
+	if(val != "") result += var + "=" + val;
+	llSetObjectDesc(llDumpList2String(result, "&"));
 }
 
 
 // clear RAM
 Clr() {
 
-    lCommands = [];
-    llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
-    makeMainMenu();
+	lCommands = [];
+	llOwnerSay("RAM Memory cleared. Notecards, if any, are not modified.");
+	makeMainMenu();
 }
 
 integer checkNoteCards()
 {
-    // Check that they have saved an Appeaance and Path notecard
-    integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
-    
-    integer i;
-    integer count;
-    for (; i < num; i++){
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
-            count++;
-        if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
-            count++;
-    }
-    DEBUG("Checked " + (string) count + " Notecards");
-    // if we have both, run the NPC
-    return count;
+	// Check that they have saved an Appeaance and Path notecard
+	integer num = llGetInventoryNumber(INVENTORY_NOTECARD);    // how many notecards overall
+
+	integer i;
+	integer count;
+	for (; i < num; i++){
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Notecard)
+			count++;
+		if (llGetInventoryName(INVENTORY_NOTECARD,i) == Appearance)
+			count++;
+	}
+	DEBUG("Checked " + (string) count + " Notecards");
+	// if we have both, run the NPC
+	return count;
 }
 
 Update(string SName) {
-         
-    // delete all NPC* scripts except myself
-    integer i;
-    integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
-    for (i = 0; i < j; i++) {
-        string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
-        string match = llGetSubString(targetName,0,2);
-        
-        if (match == SName && llGetScriptName() != targetName){
-                llOwnerSay("Upgrading " + targetName);
-            if (! LSLEditor){        // lets not kill the editor
-                llRemoveInventory(targetName);
-            }
-        }
-    }
+
+	// delete all NPC* scripts except myself
+	integer i;
+	integer j = llGetInventoryNumber(INVENTORY_SCRIPT);
+	for (i = 0; i < j; i++) {
+		string targetName = llGetInventoryName(INVENTORY_SCRIPT,i);
+		string match = llGetSubString(targetName,0,2);
+
+		if (match == SName && llGetScriptName() != targetName){
+			llOwnerSay("Upgrading " + targetName);
+			if (! LSLEditor){        // lets not kill the editor
+				llRemoveInventory(targetName);
+			}
+		}
+	}
 }
 
 // Get all default saved params from the Description
 GetSwitches()
 {
-         string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
-        if (rA == "A")
-            relAbs = "Absolute";
-        else  if (rA == "R")
-            relAbs = "Relative";
-        else
-            relAbs = "Absolute";
+	string rA = KeyValueGet("co"); // Get the remembered menu setting for Abs Vs Relative
+	if (rA == "A")
+		relAbs = "Absolute";
+	else  if (rA == "R")
+		relAbs = "Relative";
+	else
+		relAbs = "Absolute";
 
-            
-        // reenable NPC if sensor is on.
-        if ("on" == KeyValueGet("se"))
-        {
-            NPCEnabled = TRUE;
-            mSensor  = "Sense is On";
-            ProcessSensor();       // fake 1 avatar to get it rezzed
-        } else {
-            mSensor  = "Sense is Off";
-        }
-    }
+
+	// reenable NPC if sensor is on.
+	if ("on" == KeyValueGet("se"))
+	{
+		NPCEnabled = TRUE;
+		mSensor  = "Sense is On";
+		ProcessSensor();       // fake 1 avatar to get it rezzed
+	} else {
+			mSensor  = "Sense is Off";
+	}
+}
 
 
 SaveKey(key akey)
 {
-    DEBUG("Saving Key of " + (string) akey);
-    KeyValueSet("key", akey);
-    if (akey !=  (key) KeyValueGet("key") )
-    {
-        DEBUG("Fatal error, cannot save key");
-    }
-    gNpcKey = akey;
+	DEBUG("Saving Key of " + (string) akey);
+	KeyValueSet("key", akey);
+	if (akey !=  (key) KeyValueGet("key") )
+	{
+		DEBUG("Fatal error, cannot save key");
+	}
+	gNpcKey = akey;
 }
 
 
 key NPCKey()
 {
-    key akey = gNpcKey;   // from cached copy
-    // gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
-    if (gNpcKey == NULL_KEY)
-    {
-        //DEBUG("Get DKey");
-        akey = KeyValueGet("key");    // from Description of the prim
-    }
-   // DEBUG("NPC KEY:" + (string) akey);   
-    return  akey;
+	key akey = gNpcKey;   // from cached copy
+	// gNpcKey saves a lot of CPU processing by caching the key, if blank we get it from the description
+	if (gNpcKey == NULL_KEY)
+	{
+		//DEBUG("Get DKey");
+		akey = KeyValueGet("key");    // from Description of the prim
+	}
+	// DEBUG("NPC KEY:" + (string) akey);
+	return  akey;
 }
 
 
@@ -1238,453 +1238,453 @@ key NPCKey()
 
 default
 {
-    changed(integer change) {
-        if(change & CHANGED_REGION_START) {
-            llResetScript();
-        }
-    }
-    
-    on_rez(integer start_param)
-    {
-        llResetScript();
-    }
+	changed(integer change) {
+		if(change & CHANGED_REGION_START) {
+			llResetScript();
+		}
+	}
 
-    state_entry() {
-        
-        llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
-        DoDelete(); // kill any NPC that is out running
-        Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
-        GetSwitches(); // Get all default saved params from the Description
+	on_rez(integer start_param)
+	{
+		llResetScript();
+	}
 
-        // 4.1 allow listeners to send us commands
-        if (allowListener)
-            llListen(link_Channel,"","","");
-        TimerEvent(TIMER);
-    } 
+	state_entry() {
+
+		llSetText("",<1,1,1>,1.0);  // clr all hovertext- we may not be using it.
+		DoDelete(); // kill any NPC that is out running
+		Update("NPC"); // If dragged and ropped into a prim with any script named "NPC...", this will replace it.
+		GetSwitches(); // Get all default saved params from the Description
+
+		// 4.1 allow listeners to send us commands
+		if (allowListener)
+			llListen(link_Channel,"","","");
+		TimerEvent(TIMER);
+	}
 
 
-    touch_start(integer n) 
-    {           // if touched, make a menu
-    
-        if (checkPerms()) {
-            if (RecordPath == STATE) {
-                makeMenu(lAtButtons); 
-            }   else {
-                makeMainMenu();
-            }
-        } else {
-            makeUserMenu();
-        }
-    }
+	touch_start(integer n)
+	{           // if touched, make a menu
 
-    // menu listener
-    listen(integer iChannel, string name, key id, string message) {
+		if (checkPerms()) {
+			if (RecordPath == STATE) {
+				makeMenu(lAtButtons);
+			}   else {
+					makeMainMenu();
+			}
+		} else {
+				makeUserMenu();
+		}
+	}
 
-        // process @commands that come in via the listener
-        if (iChannel == link_Channel)
-        {
-            ParseMsg(message);
-            return;
-        }
-        
-        if (MENU) {
-            llListenRemove(iHandle);
-            MENU = 0;       // menu is off
-            iHandle = 0;
-        }
-        
-        if (message == "Stop NPC")
-        {
-            lNpcCommandList = []; // force reload of notecard
-            NPCEnabled = FALSE;
-            if (NPCKey() != NULL_KEY){
-                Kill(sNPCName);
-            } else {
-                bNPC_STOP = TRUE;
-                makeText("Enter name of an NPC to stop");
-            }
-        }
-        else if (message == "Menu" ) {
-            makeMainMenu();
-        }
-        else if (message == "Erase RAM"){
-            Clr();
-        }
-        else if (message == "Relative"){
-            relAbs = "Absolute";
-            KeyValueSet("co","A");   // remember coordinates = A
-            Clr();
-        }
-        else if (message == "Absolute"){
-            relAbs = "Relative";
-            KeyValueSet("co","R");   // remember coordinates = R
-            Clr();
-        }
-        else if (message == "Recording"){
-            DoMenuForCommands();        // show them the recording menu
-        }
-        else if (message == "Owner Only") {
-            priPub = "Group";
-            KeyValueSet("pr","1");
+	// menu listener
+	listen(integer iChannel, string name, key id, string message) {
 
-            llOwnerSay("Group members have control");
-            makeMainMenu();
-        }
-        else if (message == "Group") {
-            priPub = "Owner Only";
-            KeyValueSet("pr","0");
-            llOwnerSay("Only you have control");
-            makeMainMenu();
-        }
-        else if (message == "Sense is On") {
-            mSensor ="Sense is Off";
-            KeyValueSet("se", "off");
-            llOwnerSay(mSensor);
-            makeMainMenu();
-        }
-        else if (message == "Sense is Off") {
-            mSensor ="Sense is On";
-            llOwnerSay(mSensor);
-            KeyValueSet("se", "on");
-            
-            NPCEnabled = TRUE;
-            
-            integer count = checkNoteCards();
-            if (count >= 2)  {
-                DEBUG("Notecards ok, DoProcessNPCLine");
-                DoProcessNPCLine();
-                return;
-            }
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
+		// process @commands that come in via the listener
+		if (iChannel == link_Channel)
+		{
+			ParseMsg(message);
+			return;
+		}
 
-            llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
-            makeMainMenu();
-        }
-        else if (message == "Appearance")  {
-            llRemoveInventory(Appearance);            // delete the notecard
-            osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard 
-            llOwnerSay("Your outfit has been saved");
-            makeMainMenu();
-        }
-        else if (message == "Save") {
-            if (llGetListLength(lCommands) == 0) {
-                llOwnerSay("Nothing recorded, you need to make a recording first");
-                makeMainMenu();
-                return;
-            }
-            DoSave();
-        }
-        else if (message == "Help"){
-            llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
-            makeMainMenu();
-        }
-        else if (message == "Start NPC")    {
-            integer count = checkNoteCards();
+		if (MENU) {
+			llListenRemove(iHandle);
+			MENU = 0;       // menu is off
+			iHandle = 0;
+		}
 
-            NPCEnabled = TRUE;
+		if (message == "Stop NPC")
+		{
+			lNpcCommandList = []; // force reload of notecard
+			NPCEnabled = FALSE;
+			if (NPCKey() != NULL_KEY){
+				Kill(sNPCName);
+			} else {
+					bNPC_STOP = TRUE;
+				makeText("Enter name of an NPC to stop");
+			}
+		}
+		else if (message == "Menu" ) {
+			makeMainMenu();
+		}
+		else if (message == "Erase RAM"){
+			Clr();
+		}
+		else if (message == "Relative"){
+			relAbs = "Absolute";
+			KeyValueSet("co","A");   // remember coordinates = A
+			Clr();
+		}
+		else if (message == "Absolute"){
+			relAbs = "Relative";
+			KeyValueSet("co","R");   // remember coordinates = R
+			Clr();
+		}
+		else if (message == "Recording"){
+			DoMenuForCommands();        // show them the recording menu
+		}
+		else if (message == "Owner Only") {
+			priPub = "Group";
+			KeyValueSet("pr","1");
 
-            if (LSLEditor) {
-                DoProcessNPCLine();
-                return;
-            }
-            
-            if (count >= 2) {
-                DEBUG("Notecards approved , calling DoProcessNPCLine");
-                SetStop(FALSE); // Let's run the notecard
-                DoProcessNPCLine();
-                return;
-            }
+			llOwnerSay("Group members have control");
+			makeMainMenu();
+		}
+		else if (message == "Group") {
+			priPub = "Owner Only";
+			KeyValueSet("pr","0");
+			llOwnerSay("Only you have control");
+			makeMainMenu();
+		}
+		else if (message == "Sense is On") {
+			mSensor ="Sense is Off";
+			KeyValueSet("se", "off");
+			llOwnerSay(mSensor);
+			makeMainMenu();
+		}
+		else if (message == "Sense is Off") {
+			mSensor ="Sense is On";
+			llOwnerSay(mSensor);
+			KeyValueSet("se", "on");
 
-            llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
-      
-        }
-        else if (bNPC_STOP){
-            bNPC_STOP = FALSE;
-            Kill(message);
-        }
-        else if (message == ">>"){
-            makeMenu(lMenu2);
-        }
-        else if (message == ">>>"){
-            makeMenu(lMenu3);
-        }
-        else if (message == "<<") {
-            makeMenu(lAtButtons);
-        }
-        else if (message == "<<<") {
-            makeMenu(lMenu2);
-        }
-        else if (message == "@comment"){
-            Text("# ","Enter a comment","");
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@run"){
-            lCommands += "@run=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@fly"){
-            lCommands += "@fly=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@land"){
-            lCommands += "@land=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@walk") {
-            lCommands += "@walk=" + Pos() + "\n";
-            llOwnerSay("Recorded position: " + Pos());
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@stop"){
-            lCommands += "@stop"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@sound"){
-            Text("@sound=","Enter a sound name or UUID to trigger","");
-        }
-        else if (message == "@randsound"){
-            lCommands += "@randsound"+  "\n";
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@say") {
-            Text("@say=","Enter what the NPC will say","");
-        }
-        else if (message == "@whisper"){
-            Text("@whisper=","Enter what the NPC will whisper","");
-        }
-        else if (message == "@shout"){
-            Text("@shout=","Enter what the NPC will shout","");
-        }
-        else if (message == "@wander") {
-            Text("@wander=","Enter radius to wander","Enter number of wanders");
-        }
-        else if (message == "@pause") {
-            Text("@pause=","Enter time to pause","");
-        }
-        else if (message == "@rotate") {
-            Text("@rotate=","Enter degrees to rotate","");
-        }
-        else if (message == "@sit"){
-            Text("@sit=","Enter name of object to sit on","");
-        }
-        else if (message == "@teleport"){
-            lCommands += "@teleport=" + Pos() + "\n";
-            llOwnerSay("teleport to position: " + Pos());
-            makeMenu(lMenu3);
-        }
-        else if (message == "@touch"){
-            Text("@touch=","Enter name of object to touch","");
-        }
-        else if (message == "@cmd"){
-            Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
-        }
-        else if (message == "@stand"){
-            lCommands += "@stand\n";
-            llOwnerSay("Stand Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (message == "@animate"){
-            Text("@animate=","Enter animation name to play","Enter time to play the animation");
-        }
-        else if (message == "@attach"){
-            Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
-        }
-         else if (message == "@speed"){
-            Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
-        }
-               
+			NPCEnabled = TRUE;
 
-        // Save NPC name
-        else if (MakeNotecard == STATE) {
-            sNPCName = message; // in case we need to kill it.
-            
-            vector  vDest = (vector)  Pos();
+			integer count = checkNoteCards();
+			if (count >= 2)  {
+				DEBUG("Notecards ok, DoProcessNPCLine");
+				DoProcessNPCLine();
+				return;
+			}
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-            if (relAbs == "Relative")
-            {
-                vDest  -= llGetPos();    // just an offset for relative
-            }
-            sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
-            integer i;
-            integer j = llGetListLength(lCommands);
-            for (; i < j; i++){
-                // get the command to save to the notecard
-                string line = llList2String(lCommands,i);
-                if (relAbs == "Absolute") {
-                    sNotecard += line;    // add the un-modified string to the notecard
-                } else {
-                        // since we have to record absolute coords since we do not know where the box goes until they press Save,
-                        // we process the absolute to relative conversion for walks here
-                        list parts = llParseString2List(line,["="],[]); //get the @command
+			llOwnerSay("You have not saved a recording and/or appearance, so you cannot start a NPC");
+			makeMainMenu();
+		}
+		else if (message == "Appearance")  {
+			llRemoveInventory(Appearance);            // delete the notecard
+			osAgentSaveAppearance(kUserKey,Appearance);    // make the ntecard
+			llOwnerSay("Your outfit has been saved");
+			makeMainMenu();
+		}
+		else if (message == "Save") {
+			if (llGetListLength(lCommands) == 0) {
+				llOwnerSay("Nothing recorded, you need to make a recording first");
+				makeMainMenu();
+				return;
+			}
+			DoSave();
+		}
+		else if (message == "Help"){
+			llLoadURL(kUserKey,"Click to view help","http://www.outworldz.com/opensim/posts/NPC/");
+			makeMainMenu();
+		}
+		else if (message == "Start NPC")    {
+			integer count = checkNoteCards();
 
-                    if (llList2String(parts,0) == "@walk") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@walk=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@fly") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@fly=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@run") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@run=" + (string) vec + "\n";
-                    }
-                    else if (llList2String(parts,0) == "@land") {
-                        vector vec = (vector) llList2String(parts,1) - llGetPos();
-                        sNotecard += "@land=" + (string) vec + "\n";
-                    }
-                    else {
-                        sNotecard += line;    // add the un-modified string to the notecard
-                    }
-                }
-            }
-            llRemoveInventory(Notecard);        // delete the old notecard
-            osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
-            llSay(0,sNotecard);
-            llOwnerSay("Commands notecard has been written");
-            STATE = NULL;
-        } // MakeNotecard
+			NPCEnabled = TRUE;
 
-        else  if (! llStringLength(sParam2)) {
-            lCommands +=  sCommand + message + "\n";
-            llOwnerSay("Recorded");
-            makeMenu(lAtButtons);
-        }
-        else if (llStringLength(sParam2)){
-            sCommand = sCommand + message + "|";
-            llOwnerSay("Recorded");
-            makeText(sParam2);
-            sParam2 = "";
-        }
+			if (LSLEditor) {
+				DoProcessNPCLine();
+				return;
+			}
 
-    }
+			if (count >= 2) {
+				DEBUG("Notecards approved , calling DoProcessNPCLine");
+				SetStop(FALSE); // Let's run the notecard
+				DoProcessNPCLine();
+				return;
+			}
+
+			llOwnerSay("You have not saved a recording or maybe an appearance, so we cannot start a NPC");
+
+		}
+		else if (bNPC_STOP){
+			bNPC_STOP = FALSE;
+			Kill(message);
+		}
+		else if (message == ">>"){
+			makeMenu(lMenu2);
+		}
+		else if (message == ">>>"){
+			makeMenu(lMenu3);
+		}
+		else if (message == "<<") {
+			makeMenu(lAtButtons);
+		}
+		else if (message == "<<<") {
+			makeMenu(lMenu2);
+		}
+		else if (message == "@comment"){
+			Text("# ","Enter a comment","");
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@run"){
+			lCommands += "@run=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@fly"){
+			lCommands += "@fly=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@land"){
+			lCommands += "@land=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@walk") {
+			lCommands += "@walk=" + Pos() + "\n";
+			llOwnerSay("Recorded position: " + Pos());
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@stop"){
+			lCommands += "@stop"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@sound"){
+			Text("@sound=","Enter a sound name or UUID to trigger","");
+		}
+		else if (message == "@randsound"){
+			lCommands += "@randsound"+  "\n";
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@say") {
+			Text("@say=","Enter what the NPC will say","");
+		}
+		else if (message == "@whisper"){
+			Text("@whisper=","Enter what the NPC will whisper","");
+		}
+		else if (message == "@shout"){
+			Text("@shout=","Enter what the NPC will shout","");
+		}
+		else if (message == "@wander") {
+			Text("@wander=","Enter radius to wander","Enter number of wanders");
+		}
+		else if (message == "@pause") {
+			Text("@pause=","Enter time to pause","");
+		}
+		else if (message == "@rotate") {
+			Text("@rotate=","Enter degrees to rotate","");
+		}
+		else if (message == "@sit"){
+			Text("@sit=","Enter name of object to sit on","");
+		}
+		else if (message == "@teleport"){
+			lCommands += "@teleport=" + Pos() + "\n";
+			llOwnerSay("teleport to position: " + Pos());
+			makeMenu(lMenu3);
+		}
+		else if (message == "@touch"){
+			Text("@touch=","Enter name of object to touch","");
+		}
+		else if (message == "@cmd"){
+			Text("@cmd=","Enter cjhannel to speak on","Enter text to speak");
+		}
+		else if (message == "@stand"){
+			lCommands += "@stand\n";
+			llOwnerSay("Stand Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (message == "@animate"){
+			Text("@animate=","Enter animation name to play","Enter time to play the animation");
+		}
+		else if (message == "@attach"){
+			Text("@animate=","Enter inventory name to attach","Enter number of the attachment point (1-40)");
+		}
+		else if (message == "@speed"){
+			Text("@speed=","Enter a speed for the NPC, 1=100% normal speed, 0.5=50% speed","");
+		}
+
+
+		// Save NPC name
+		else if (MakeNotecard == STATE) {
+			sNPCName = message; // in case we need to kill it.
+
+			vector  vDest = (vector)  Pos();
+
+			if (relAbs == "Relative")
+			{
+				vDest  -= llGetPos();    // just an offset for relative
+			}
+			sNotecard = "@spawn=" + message + "|" +  (string) vDest  + "\n";
+			integer i;
+			integer j = llGetListLength(lCommands);
+			for (; i < j; i++){
+				// get the command to save to the notecard
+				string line = llList2String(lCommands,i);
+				if (relAbs == "Absolute") {
+					sNotecard += line;    // add the un-modified string to the notecard
+				} else {
+						// since we have to record absolute coords since we do not know where the box goes until they press Save,
+						// we process the absolute to relative conversion for walks here
+						list parts = llParseString2List(line,["="],[]); //get the @command
+
+					if (llList2String(parts,0) == "@walk") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@walk=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@fly") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@fly=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@run") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@run=" + (string) vec + "\n";
+					}
+					else if (llList2String(parts,0) == "@land") {
+						vector vec = (vector) llList2String(parts,1) - llGetPos();
+						sNotecard += "@land=" + (string) vec + "\n";
+					}
+					else {
+						sNotecard += line;    // add the un-modified string to the notecard
+					}
+				}
+			}
+			llRemoveInventory(Notecard);        // delete the old notecard
+			osMakeNotecard(Notecard,sNotecard); // Makes the notecard.
+			llSay(0,sNotecard);
+			llOwnerSay("Commands notecard has been written");
+			STATE = NULL;
+		} // MakeNotecard
+
+		else  if (! llStringLength(sParam2)) {
+			lCommands +=  sCommand + message + "\n";
+			llOwnerSay("Recorded");
+			makeMenu(lAtButtons);
+		}
+		else if (llStringLength(sParam2)){
+			sCommand = sCommand + message + "|";
+			llOwnerSay("Recorded");
+			makeText(sParam2);
+			sParam2 = "";
+		}
+
+	}
 
 
 
-    timer(){
-       // DEBUG("tick");
-        
-        // if llDialog is up, kill the listener for the dialog box.
-        if (iHandle) {
-            llOwnerSay("Menu timed out");
-            llListenRemove(iHandle);
-            iHandle = 0;
-            return;             // ^^^^^^^^^^^^^^^^^^^^^^^
-        }
-        // if NoBodyHome, we are sensing for an avatar
-        else if (NobodyHome == STATE) {
-            ProcessSensor();
-            return;
-        }
-        // if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
-        else if (Spawning == STATE) {
-            STATE = NULL;
-            TimerEvent(TIMER);
-        }
-        // We end aniamtions with a timer
-        else if (Animate == STATE){
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-        }
-        
-        else if (Walking == STATE) {
-            if (--iWaitCounter) {
-                DEBUG("still walking...");
-                if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
-                    return;
-                }
-            }
+	timer(){
+		// DEBUG("tick");
 
-            DEBUG("At Destination: " + (string) newDest);
-            
-            // walk, fly, run, land
-            if (walkstate == 1) {
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 2)  {
-                    // nothing
-                } else if (walkstate == 3) {
-                     NPCAnimate(STAND);
-                     NPCWalkOption = OS_NPC_NO_FLY;
-            } else if (walkstate == 4) {
-                llShout(FLIGHT,"landing");
-                NPCAnimate(STAND);
-                NPCWalkOption = OS_NPC_NO_FLY;
-            }
-        }
-        // Wandering timer 
-        else if (Wander == STATE) {
-            if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
-                if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
-                    return;
-            }
+		// if llDialog is up, kill the listener for the dialog box.
+		if (iHandle) {
+			llOwnerSay("Menu timed out");
+			llListenRemove(iHandle);
+			iHandle = 0;
+			return;             // ^^^^^^^^^^^^^^^^^^^^^^^
+		}
+		// if NoBodyHome, we are sensing for an avatar
+		else if (NobodyHome == STATE) {
+			ProcessSensor();
+			return;
+		}
+		// if we are spawning, we need time to rez the NPC, then start processing NPC Commands.
+		else if (Spawning == STATE) {
+			STATE = NULL;
+			TimerEvent(TIMER);
+		}
+		// We end aniamtions with a timer
+		else if (Animate == STATE){
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+		}
 
-            // see if wander counter == 0, if so, stop walking, go to stand and process next line
-            if(RAMwc == 0) {
-                NPCAnimate(STAND);
-                DEBUG("Wander ended, calling DoProcessNPCLine");
-                STATE = NULL;
-                return;
-            }
-            // one less time to wander around
-            RAMwc--;
-            NPCAnimate(STAND);
-            TimerEvent(TIMER);
-            StateWanderhold();
-            return;
-        }
-        // Wandering requires us to re-wander when we reach a destination
-        else if (WanderHold == STATE) {
-            StateWander();
-            return;
-        }
-        else if (DoProcess == STATE) {
-            TimerEvent(QUICK);
-        }
+		else if (Walking == STATE) {
+			if (--iWaitCounter) {
+				DEBUG("still walking...");
+				if (llVecDist(osNpcGetPos(NPCKey()), newDest) > MAXDIST)  {
+					return;
+				}
+			}
 
-        STATE = NULL;
+			DEBUG("At Destination: " + (string) newDest);
 
-        // We always process a NPC line at end of timer.
-        DEBUG("Tick end, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-    }
+			// walk, fly, run, land
+			if (walkstate == 1) {
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 2)  {
+					// nothing
+				} else if (walkstate == 3) {
+						NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			} else if (walkstate == 4) {
+					llShout(FLIGHT,"landing");
+				NPCAnimate(STAND);
+				NPCWalkOption = OS_NPC_NO_FLY;
+			}
+		}
+		// Wandering timer
+		else if (Wander == STATE) {
+			if (--iWaitCounter) {          // wait 60 seconds to get to a destination.
+				if (llVecDist(osNpcGetPos(NPCKey()), vWanderPos) > MAXDIST)
+					return;
+			}
 
-    // sensors are used for sitting on prims
-    // Neo Cortex: added different states to trigger sit or touch
-    sensor(integer num) {
-        if (Sit == STATE ) {
-            osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
-            DEBUG("Seated, calling DoProcessNPCLine");
-            
-            STATE = 0;
-        } else if (Touch == STATE) {
-            osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
-            DEBUG("Touched, calling DoProcessNPCLine");
-            STATE = 0;
-        }
-        DoProcessNPCLine();
-    }
-    no_sensor(){
-        DEBUG ("no target prim located, calling DoProcessNPCLine");
-        DoProcessNPCLine();
-        STATE = NULL;
-    }
+			// see if wander counter == 0, if so, stop walking, go to stand and process next line
+			if(RAMwc == 0) {
+				NPCAnimate(STAND);
+				DEBUG("Wander ended, calling DoProcessNPCLine");
+				STATE = NULL;
+				return;
+			}
+			// one less time to wander around
+			RAMwc--;
+			NPCAnimate(STAND);
+			TimerEvent(TIMER);
+			StateWanderhold();
+			return;
+		}
+		// Wandering requires us to re-wander when we reach a destination
+		else if (WanderHold == STATE) {
+			StateWander();
+			return;
+		}
+		else if (DoProcess == STATE) {
+			TimerEvent(QUICK);
+		}
+
+		STATE = NULL;
+
+		// We always process a NPC line at end of timer.
+		DEBUG("Tick end, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+	}
+
+	// sensors are used for sitting on prims
+	// Neo Cortex: added different states to trigger sit or touch
+	sensor(integer num) {
+		if (Sit == STATE ) {
+			osNpcSit(NPCKey(), llDetectedKey(0), OS_NPC_SIT_NOW);
+			DEBUG("Seated, calling DoProcessNPCLine");
+
+			STATE = 0;
+		} else if (Touch == STATE) {
+				osNpcTouch(NPCKey(), llDetectedKey(0), LINK_THIS);
+			DEBUG("Touched, calling DoProcessNPCLine");
+			STATE = 0;
+		}
+		DoProcessNPCLine();
+	}
+	no_sensor(){
+		DEBUG ("no target prim located, calling DoProcessNPCLine");
+		DoProcessNPCLine();
+		STATE = NULL;
+	}
+
+
+	link_message(integer sender, integer num, string str, key id){
+		if (num == 0)
+			ParseMsg(str);
+	}
 
-    
-    link_message(integer sender, integer num, string str, key id){
-        if (num == 0)
-            ParseMsg(str);
-    }
-        
 }
 
 // __ END__
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Chat commands.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Chat commands.lsl
index 7737b722..d475fd0d 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Chat commands.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Chat commands.lsl	
@@ -4,7 +4,6 @@
 // :AUTHOR:Ferd Frederix
 // :KEYWORDS:
 // :CREATED:2015-07-17 13:15:19
-// :EDITED:2015-07-17  12:15:19
 // :ID:27
 // :NUM:1807
 // :REV:1
@@ -15,13 +14,13 @@
 
 default
 {
-     state_entry() {
-        llSetText("Type commands in chat to control the NPC, such as '@say=Hello'",<1,1,1>,1.0);
-        llListen(0,"","","");
-    }
+	state_entry() {
+		llSetText("Type commands in chat to control the NPC, such as '@say=Hello'",<1,1,1>,1.0);
+		llListen(0,"","","");
+	}
 
-    listen(integer channel, string name, key id, string message)
-    {
-        llMessageLinked(LINK_ROOT,0, message,"");
-    }
+	listen(integer channel, string name, key id, string message)
+	{
+		llMessageLinked(LINK_ROOT,0, message,"");
+	}
 }
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Collision test.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Collision test.lsl
index 59aaac7f..1d914753 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Collision test.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Collision test.lsl	
@@ -4,7 +4,6 @@
 // :AUTHOR:Ferd Frederix
 // :KEYWORDS:
 // :CREATED:2015-07-17 13:15:49
-// :EDITED:2015-09-23  12:06:52
 // :ID:27
 // :NUM:1808
 // :REV:3
@@ -15,33 +14,33 @@
 // rev 3: added on_rez()  and STATUS_PHANTOM to state_entry - otherwise reset on Linux boxes did no collide any more.
 default
 {
-    state_entry()
-    {
-        llSetStatus(STATUS_PHANTOM,FALSE);
-        llVolumeDetect(FALSE);
-        llSleep(0.1);
-        llVolumeDetect(TRUE);
-    }
-    
-    collision_start(integer n) {
-        llMessageLinked(LINK_SET,0, "@animate=someanimation|10","");
-        llSetTimerEvent(5);
-    }
-    timer()
-    {
-        llMessageLinked(LINK_SET,0, "@animate=Stand|1","");
-        llSetTimerEvent(0);
-    }
-    
-    changed(integer what)
-    {
-        if (what & CHANGED_REGION_START)
-        {
-            llResetScript();
-        }
-    }
-    on_rez(integer p)
-    {
-        llResetScript();
-    }
+	state_entry()
+	{
+		llSetStatus(STATUS_PHANTOM,FALSE);
+		llVolumeDetect(FALSE);
+		llSleep(0.1);
+		llVolumeDetect(TRUE);
+	}
+
+	collision_start(integer n) {
+		llMessageLinked(LINK_SET,0, "@animate=someanimation|10","");
+		llSetTimerEvent(5);
+	}
+	timer()
+	{
+		llMessageLinked(LINK_SET,0, "@animate=Stand|1","");
+		llSetTimerEvent(0);
+	}
+
+	changed(integer what)
+	{
+		if (what & CHANGED_REGION_START)
+		{
+			llResetScript();
+		}
+	}
+	on_rez(integer p)
+	{
+		llResetScript();
+	}
 }
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Stop Processing.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Stop Processing.lsl
index 07e7481d..5b173213 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Stop Processing.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Stop Processing.lsl	
@@ -4,7 +4,6 @@
 // :AUTHOR:Ferd Frederix
 // :KEYWORDS:
 // :CREATED:2015-07-17 13:16:10
-// :EDITED:2015-07-17  12:16:10
 // :ID:27
 // :NUM:1809
 // :REV:1
@@ -15,12 +14,12 @@
 
 default
 {
-     state_entry() {
-        llSetText("Click to make the NPC stop processing commands",<1,1,1>,1.0);
-    }
+	state_entry() {
+		llSetText("Click to make the NPC stop processing commands",<1,1,1>,1.0);
+	}
 
-    touch_start(integer total_number)
-    {
-        llMessageLinked(LINK_ROOT,0, "@stop","");
-    }
+	touch_start(integer total_number)
+	{
+		llMessageLinked(LINK_ROOT,0, "@stop","");
+	}
 }
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch Trigger NPC.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch Trigger NPC.lsl
index 6ea74fc7..545e776e 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch Trigger NPC.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch Trigger NPC.lsl	
@@ -4,23 +4,22 @@
 // :AUTHOR:Ferd Frederix
 // :KEYWORDS:
 // :CREATED:2015-07-17 13:16:51
-// :EDITED:2015-07-17  12:16:51
 // :ID:27
 // :NUM:1811
 // :REV:1
-// :WORLD:Second Life
+// :WORLD:Opensim
 // :DESCRIPTION:
 // Sample touch to trigger a NPC script
 // :CODE:
 
 default
 {
-     state_entry() {
-        llSetText("Click to make the NPC say hello",<1,1,1>,1.0);
-    }
+	state_entry() {
+		llSetText("Click to make the NPC say hello",<1,1,1>,1.0);
+	}
 
-    touch_start(integer total_number)
-    {
-        llMessageLinked(LINK_ROOT, 0, "@say=Hello there, " + llDetectedName(0), "");
-    }
+	touch_start(integer total_number)
+	{
+		llMessageLinked(LINK_ROOT, 0, "@say=Hello there, " + llDetectedName(0), "");
+	}
 }
diff --git a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch to Go.lsl b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch to Go.lsl
index d00726d9..6dfda5be 100644
--- a/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch to Go.lsl	
+++ b/All In One NPC Recorder and Player/All In One NPC Recorder and Player/Test Object/Touch to Go.lsl	
@@ -4,23 +4,22 @@
 // :AUTHOR:Ferd Frederix
 // :KEYWORDS:
 // :CREATED:2015-07-17 13:16:29
-// :EDITED:2015-07-17  12:16:29
 // :ID:27
 // :NUM:1810
 // :REV:1
-// :WORLD:Second Life
+// :WORLD:Opensim
 // :DESCRIPTION:
 // Sample touch to go script for all in one NPC animator
 // :CODE:
 
 default
 {
-     state_entry() {
-        llSetText("Click to make the NPC continue processing commands",<1,1,1>,1.0);
-    }
+	state_entry() {
+		llSetText("Click to make the NPC continue processing commands",<1,1,1>,1.0);
+	}
 
-    touch_start(integer total_number)
-    {
-        llMessageLinked(LINK_ROOT,0, "@go","");
-    }
+	touch_start(integer total_number)
+	{
+		llMessageLinked(LINK_ROOT,0, "@go","");
+	}
 }
diff --git a/Flying Bee and Hive/Bee/Object/Opensim Bee.lsl b/Flying Bee and Hive/Bee/Object/Opensim Bee.lsl
index cda5d607..f195de99 100644
--- a/Flying Bee and Hive/Bee/Object/Opensim Bee.lsl	
+++ b/Flying Bee and Hive/Bee/Object/Opensim Bee.lsl	
@@ -1,67 +1,68 @@
 // :SHOW:1
-// :CATEGORY:Flying Bee 
+// :CATEGORY:Flying Bee
 // :NAME:Flying Bee and Hive
-// :AUTHOR:Ferd Frederix 
+// :AUTHOR:Ferd Frederix
 // :KEYWORDS:
-// :CREATED:2013-09-08 12:59:45 
-// :EDITED:2015-03-17  09:26:22
+// :CREATED:2013-09-08 12:59:45
 // :ID:995
 // :NUM:1725
-// :REV:4
+// :REV:5
 // :WORLD:Opensim, SecondLife
 // :DESCRIPTION:
 // A free flying bee that gathers pollen and takes it to his hive for either OpenSim or Second Life
 // :CODE:
-// Simple Bee script to locate and gather pollen from all prims named "Flower" then returns to the "Beehive" 
+// Simple Bee script to locate and gather pollen from all prims named "Flower" then returns to the "Beehive"
 // Requires 2 sounds buzz1 and buzz2
 // !!!!!!!!!!!!!!
 // Mods by Donjr Spiegelblatt for Opensim to remove chance of thread locking on 3/7/2015
 // Thank YOU very much, DonJr !
 // 03-17-2015 fixed up a problem reported by DonJr where the bees visited to flowers in the wrong sequence.
-
-// Note: For Opensim, make sure to set the prim to PHYSICS type = NONE manually
-
+ // Note: For Opensim, make sure to set the prim to PHYSICS type = NONE manually
+//======================================================================
+// Note: Inworldz Revisions - 7/9/2016
+// RadioRoy Wattz (Inworldz)
+//======================================================================
 // Tunable items
-
+ 
 integer debug = FALSE;    // enablefor chattiness
 integer PHYSICAL = TRUE;  // for smooth movemenents enable physical.
-                          // For less lag, set this to false, but the motion willl be very quick and jerky.
-
-string FLOWER_NAME = "Flower";   // the name of the thing we seek 
-string HIVE_NAME = "Beehive";
-float DIST = 15.0;                // gow far to fly, max
+// For less lag, set this to false, but the motion willl be very quick and jerky.
+ 
+string FLOWER_NAME = "Flower";   // the name of the thing we seek
+string HIVE_NAME = "Beehive Box-1";
+float DIST = 25.0;                // gow far to fly, max
 float SPEED = 1;                  // move in this number of seconds from place to place
-
+ 
 // code bits
 vector vInitROT = <90,0,0> ;       // due to the sculpted body, this bee gets rotated 90 degrees.
 vector vFlowerOffset = <0,.10,0.1>;// due to the rotation on the sculpted body, this is back and up a bit.
-vector vHiveOffset = <0,.5,0>; 
+vector vHiveOffset = <0,.5,0>;
 rotation r90;                      //  a calculated 90 degree rotation ends up here
 integer iCount = 0;                // hive counter
-string sLocatedName;               // located name of item
-list lGlist;                       //  This is used as a first in first out stack with 2 entries per element 
-
+string sLocatedName = "Beehive Box-1";               // located name of item
+list lGlist;                       //  This is used as a first in first out stack with 2 entries per element
+ 
 DEBUG(string str)
 {
     if (debug) llOwnerSay(llGetScriptName() + ":" + str);
 }
-
-
-// pop the top entry off the stack 
-poplGlist() { 
-   lGlist = llDeleteSubList(lGlist,0,1); 
-} 
-
-//  Get the top Position 
-vector Gpos() { 
-   return llList2Vector(lGlist,0); 
-} 
-
-//  Get the top Rotation 
-rotation Grot() { 
-   return llList2Rot(lGlist,1); 
-} 
-
+ 
+ 
+// pop the top entry off the stack
+poplGlist() {
+    lGlist = llDeleteSubList(lGlist,0,1);
+}
+ 
+//  Get the top Position
+vector Gpos() {
+    return llList2Vector(lGlist,0);
+}
+ 
+//  Get the top Rotation
+rotation Grot() {
+    return llList2Rot(lGlist,1);
+}
+ 
 SetRotPos(rotation rot, vector dest)
 {
     DEBUG("moveto:" + (string) dest);
@@ -71,111 +72,118 @@ SetRotPos(rotation rot, vector dest)
     } else {
         llSetRegionPos(dest);
         llSetRot(rot);
+        llSetStatus(STATUS_PHANTOM,TRUE);
     }
 }
-
+ 
 default
-{ 
+{
     state_entry()
-    {       
+    {      
+        llStopMoveToTarget(); // new inworldz
         sLocatedName = "";
-        llSetLinkPrimitiveParamsFast(LINK_ALL_CHILDREN, [PRIM_PHYSICS_SHAPE_TYPE, PRIM_PHYSICS_SHAPE_NONE]);
-        // set rotation for this sculpted bee - remove this if yiou use a base prim
-         vector new = vInitROT * DEG_TO_RAD; 
+        llSetLinkPrimitiveParamsFast(LINK_ALL_CHILDREN, [PRIM_PHYSICS_SHAPE_TYPE, PRIM_PHYSICS_SHAPE_NONE]); //new inworldz
+        llSleep(2); //new Inworldz
+        // set rotation for this sculpted bee - remove this if yiou use a base prim| saved-> PRIM_PHYSICS_SHAPE_TYPE
+        vector new = vInitROT * DEG_TO_RAD;
         r90 = llEuler2Rot(new);
-        
-        llSetTimerEvent(.1); // let's go!
-        
-        if (PHYSICAL)
-            llSetStatus(STATUS_PHYSICS,TRUE);
-        else
-            llSetStatus(STATUS_PHYSICS,FALSE);          
-    } 
-
-    on_rez(integer p) 
-    { 
-        llResetScript();
-    } 
-
-    timer() 
-    { 
-        llSetTimerEvent(0); 
-        if (sLocatedName == FLOWER_NAME) 
-        { 
-            if ( lGlist != [] ) 
-            { 
-                llPlaySound("buzz1",1.0); 
-
-                SetRotPos(Grot() * r90 , Gpos() + vFlowerOffset);  // orient to it 
-                llSetTimerEvent(4); 
-                poplGlist();                     // pop the top entry off the stack 
-            } 
-            else 
-            { 
+ 
+        llSetTimerEvent(.2); // let's go!// move time up from .1 to .2
+ 
+		if (PHYSICAL) {
+			llSetStatus(STATUS_PHYSICS,FALSE);	// disable, then enable to get it to engage	
+			llSetStatus(STATUS_PHYSICS,TRUE);
+		} else{
+			llSetStatus(STATUS_PHYSICS,FALSE);
+		}
+    }
+ 
+    on_rez(integer p)
+    {
+    	llSetStatus(STATUS_PHYSICS,FALSE); //new Inworldz
+    	llStopMoveToTarget( ); // new - inworldz - I Know Overkill!
+    	llResetScript();
+    }
+ 
+    timer()
+    {
+        llSetTimerEvent(0);
+        if (sLocatedName == FLOWER_NAME)
+        {
+            if ( lGlist != [] )
+            {
+                llPlaySound("buzz1",1.0);
+ 
+                SetRotPos(Grot() * r90 , Gpos() + vFlowerOffset);  // orient to it
+                llSetTimerEvent(4);
+                poplGlist();                     // pop the top entry off the stack
+            }
+            else
+            {
                 DEBUG("Look for Hive");
                 llSensor(HIVE_NAME,NULL_KEY,ACTIVE|PASSIVE,DIST,PI); // Hive can be scripted, or not
-            } 
-        } 
-        else if (sLocatedName == HIVE_NAME) 
-        { 
-            if ( iCount == 0 ) 
-            { 
-                SetRotPos(llGetRot(), Gpos());    // move in 
-                llSetTimerEvent(10); 
-            } 
-            else if ( iCount == 1 ) 
-            { 
-                llSetTimerEvent(2);
-                SetRotPos(llGetRot(),Gpos() + vHiveOffset);     // move out 
-            } 
-            else {
-                sLocatedName = "";     // fall into llSensor FLOWER_NAME 
-                llSetTimerEvent(1);  // adjust pause here
             }
-            iCount++; 
+        }
+        else if (sLocatedName == HIVE_NAME)
+        {
+            if ( iCount == 0 )
+            {
+                SetRotPos(llGetRot(), Gpos());    // move in
+                llSetTimerEvent(10);
+            }
+            else if ( iCount == 1 )
+            {
+                llSetTimerEvent(2);
+                SetRotPos(llGetRot(),Gpos() + vHiveOffset);     // move out
+            }
+            else {
+                sLocatedName = "";     // fall into llSensor FLOWER_NAME
+                llSetTimerEvent(2);  // adjust pause here
+            }
+            iCount++;
         } else {                // fixed here
-                 // as you don't want to "fall" into here until after a 1 second pause 
-
-            DEBUG("Look for Flower");
+                // as you don't want to "fall" into here until after a 1 second pause
+ 
+                DEBUG("Look for Flower");
             llSensor(FLOWER_NAME, NULL_KEY, ACTIVE|PASSIVE, DIST,PI); // flowers can be scripted, or not
         }
     }
-
-
-    sensor(integer numDetected) 
-    { 
-        DEBUG("detected:" + (string) numDetected); 
-        sLocatedName = llDetectedName(0); 
-        // Clear the stack and place the first entry on it 
-        lGlist = [ llDetectedPos(0), llDetectedRot(0) ]; 
-        if (sLocatedName == FLOWER_NAME) 
-        { 
-            // Append any additional Flowers entries onto the stack 
-            integer i; 
-            for (i = 1; i < numDetected; i++) 
-            { 
-                lGlist += [ llDetectedPos(i), llDetectedRot(i) ]; 
-            } 
-        } else { 
-            iCount = 0; 
-            llPlaySound("buzz1",1.0); 
-            // start moving towards the Hive 
-            SetRotPos(Grot()  * r90,Gpos() + vHiveOffset);    // orient to it        
-        } 
-        // next step is always timer event 
-        llSetTimerEvent(1); 
-    } 
-
-    no_sensor() 
-    { 
-        sLocatedName = ""; 
+ 
+ 
+    sensor(integer numDetected)
+    {
+        DEBUG("detected:" + (string) numDetected);
+        sLocatedName = llDetectedName(0);
+        // Clear the stack and place the first entry on it
+        lGlist = [ llDetectedPos(0), llDetectedRot(0) ];
+        if (sLocatedName == FLOWER_NAME)
+        {
+            // Append any additional Flowers entries onto the stack
+            integer i;
+            for (i = 1; i < numDetected; i++)
+            {
+                lGlist += [ llDetectedPos(i), llDetectedRot(i) ];
+            }
+        } else {
+                iCount = 0;
+            llPlaySound("buzz1",1.0);
+            // start moving towards the Hive
+            SetRotPos(Grot()  * r90,Gpos() + vHiveOffset);    // orient to it
+        }
+        // next step is always timer event
+        llSetTimerEvent(1);
+    }
+ 
+    no_sensor()
+    {
+        sLocatedName = "";
         llSetTimerEvent(15); // try again
     }
-
+ 
     changed(integer change)
     {
         if (change & CHANGED_REGION_START)
-            llResetScript();        
+            llResetScript();
     }
-} 
-// end of code 
\ No newline at end of file
+}
+// end of code
\ No newline at end of file
diff --git a/NPC_Cat_Follower/NPC_Cat_Follower/Cat Bowl/NPC_Follower_Cat.lsl b/NPC_Cat_Follower/NPC_Cat_Follower/Cat Bowl/NPC_Follower_Cat.lsl
index 98566cb3..798cebee 100644
--- a/NPC_Cat_Follower/NPC_Cat_Follower/Cat Bowl/NPC_Follower_Cat.lsl	
+++ b/NPC_Cat_Follower/NPC_Cat_Follower/Cat Bowl/NPC_Follower_Cat.lsl	
@@ -1,50 +1,80 @@
-// :SHOW:
+// :SHOW:1
 // :CATEGORY:OpenSim NPC
 // :NAME:NPC_Cat_Follower
 // :AUTHOR:Ferd Frederix
 // :KEYWORDS:
 // :CREATED:2013-11-27 13:33:04
-// :EDITED:2015-05-29  11:26:02
+// :EDITED:2016-07-09  14:33:57
 // :ID:1004
 // :NUM:785
-// :REV:1.1
+// :REV:2.0
 // :WORLD:OpenSim
 // :DESCRIPTION:
 // A NPC follower. Will follow close to any avatar.
 //  Touch to turn on or off.
 // Has lots of mods by Ferd Frederix
 // License: http://creativecommons.org/licenses/by-nc
-// original author: jpvdgiessen
+// some code bits from author: jpvdgiessen
 // You are free:
 // to Share — to copy, distribute and transmit the work
 // to Remix — to adapt the work
 // :CODE:
 
 
+// Rev 2 - remove timers.
 // tunables
-float max_distance = 96; //distance for sensoring a real avatar
-string fName = "Orana";
-string lName = "Kitty";
+integer debug = FALSE;
 
+string fName = "Orana";
+string lName = "Kthxbye";
+
+float MIN = 5;
+float MAX = 10;  // how long the cat waits or sits, is beteween these two values
+float TimerTick = 1;    // keep this around a second
+float TIME = 5; // how often to look for avatar (keep this slow)
+float max_distance = 35; //distance for sensoring a real avatar
+float near_distance= 3; // how close the cat stays around
+float claw_distance= 1 ;// will claw you hen this close
+ 
 // stuff
-integer iWaitCounter = 60;
+integer iWaitCounter = 60;  // if we cannot get there in time,
 integer channel; // dialog channel
 integer listener; // holds the listener handle;
 key npc;    // npc key
 integer npc_on = FALSE;
 vector Dest;
 string lastAnim;
- 
+float gTimer;
+  
+DEBUG(string str)
+{
+    if (debug) llOwnerSay(str);
+}
+
+Remove()
+{
+    lastAnim = "";
+    npc_on = TRUE;
+     osNpcRemove(llGetObjectDesc());
+}
+
 Play(string anima)
 {
-    if (anima == lastAnim)
+    if (anima == lastAnim) {
+        DEBUG("Same");
         return;
+    }
    
+   // 1/5 the time, ionstead of standing, we lay down
     if (anima == "Stand" && llFrand(5) < 1)
     {
         anima = "Sit1";   
     }
     
+    gTimer =randBetween(MIN,MAX);
+    llSensorRepeat("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI, gTimer);     
+    DEBUG(anima + " time = " + (string) gTimer);
+
     osNpcPlayAnimation(npc,anima);
     osNpcStopAnimation(npc,lastAnim);
     lastAnim = anima;
@@ -65,53 +95,54 @@ Sound()
 
 walk_to_master(vector myPos)
 {
-    vector myVector = <randBetween(-2,2),randBetween(-2,2),myPos.z> ;
+    DEBUG( "walk to " + (string) Dest);
+    vector myVector = <randBetween(-near_distance,near_distance),randBetween(-near_distance,near_distance),myPos.z> ;
     myPos.z = 0;
 
     iWaitCounter = 60;
     Play("Walk");
     osNpcMoveToTarget(npc, myPos + myVector, OS_NPC_NO_FLY );
-    llSetTimerEvent(0.5);
-    Sound();
+    llSetTimerEvent(TimerTick);
+    if (llFrand(5) < .5)
+        Sound();
 }
 
 float randBetween(float min, float max)
 {
     return llFrand(max - min) + min ;
 }
-dialog()
+dialog(key avi)
 {
     channel = llCeil(llFrand(5000) + 5000);
     listener = llListen(channel,"","","");
-    llDialog(llGetOwner(), "Choose:",["Start","Remove","Appearance"],channel);
+    llDialog(avi, "Choose:",["Start","Remove","Appearance"],channel);
 }
+
 Start()
 {
-    vector npcPos = llGetPos() + <1.0,1.0,1.0>;
+    Remove();
+    vector npcPos = llGetPos() + <0.0,0.0,1.0>;
     npc = osNpcCreate(fName,lName, npcPos, "Appearance");
     llSetObjectDesc(npc);
     npc_on = TRUE;
-    llSensor("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI);  
+    osSetSpeed(npc,0.8);
+    llSensorRepeat("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI, TIME);     
+    llSetTimerEvent(TimerTick);
 }
 
 default
 { 
-    
     state_entry()
     {
-        llSay(0,"Ready");
-         osNpcRemove(llGetObjectDesc());
-         dialog();
+        llSay(0,"starting");
+        Start();
     }
     
     changed (integer what)
     {
         if (what & CHANGED_REGION_START)
         {
-            if (npc_on)
-            {
-                Start();
-            }
+            Start();
         } 
     }
     
@@ -122,8 +153,8 @@ default
     
     touch_start(integer x)
     {
-        if (llDetectedKey(0) == llGetOwner())  {
-            dialog();
+        if (llDetectedKey(0) == llGetOwner() || llSameGroup(llDetectedKey(0)))  {
+            dialog(llDetectedKey(0));
         }
     }
     
@@ -131,18 +162,16 @@ default
         llListenRemove (listener);
         if (msg == "Start")
         {
-            if( !npc_on ) {
-               Start();
-            } else {
-                llOwnerSay("Already running");
-            }
+           Start();  
         } else if (msg == "Remove")  {
             npc_on = FALSE;
-            osNpcRemove(llGetObjectDesc());
+            Remove();
+            llSensorRemove();
             llSetTimerEvent(0);
-        } else if (msg ==  "Appearance") {
+        } else if (msg ==  "-") {
             osAgentSaveAppearance(llGetOwner(), "Appearance");
             llOwnerSay("Your appearance has been saved");
+            Start();
         }
     
     }
@@ -152,218 +181,39 @@ default
         Dest = llDetectedPos( 0 );
         walk_to_master(Dest);
     }
+    
     no_sensor()
     {
-         Play("Stand");
-         llSleep(10);
-         llSensor("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI);
+         Play("Sit1");
+         llSensorRepeat("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI, TIME);     
+         llSetTimerEvent(0);
     }
    
     timer()
     {
-        vector pos;
-        if (--iWaitCounter)  {
-           
-            list Poses = llGetObjectDetails(npc,[OBJECT_POS]);
-            pos = llList2Vector(Poses, 0);
-            
-            if (llVecDist(pos, Dest ) > 4) {
-                return;
-            }
+        // for safety
+        if (--iWaitCounter == 0)  {
+            DEBUG("Lost cat, rerezzing");
+            Start();
+            return;
         }
         
-        if (llFrand(5) < 0.5) { 
-             if (llVecDist(pos, Dest ) <1) {
-                Play("Claw");
-                llTriggerSound("kitten4",1.0);
-                llSleep(1.5);
-            } else {
-                Play("Meow");
-                llTriggerSound("kitten3",1.0);
-                llSleep(1.5);
-            }
-            
-            
-        } 
+        // get NPC position
+        list P = llGetObjectDetails(npc,[OBJECT_POS]);
+        vector Npcpos;
+        Npcpos = llList2Vector(P, 0);           
         
-        Play("Stand");
+        if (llVecDist(Npcpos, Dest ) > 1) {
+            Play("Stand");
+            return;
+        }
 
-        llSleep(llFrand(5) + 1);
-        llSetTimerEvent(0);
-        llSensor("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI);
-        
-    }
-}
-// tunables
-float max_distance = 96; //distance for sensoring a real avatar
-string fName = "Orana";
-string lName = "Kitty";
-
-// stuff
-integer iWaitCounter = 60;
-integer channel; // dialog channel
-integer listener; // holds the listener handle;
-key npc;    // npc key
-integer npc_on = FALSE;
-vector Dest;
-string lastAnim;
- 
-Play(string anima)
-{
-    if (anima == lastAnim)
-        return;
-   
-    if (anima == "Stand" && llFrand(5) < 1)
-    {
-        anima = "Sit1";   
-    }
-    
-    osNpcPlayAnimation(npc,anima);
-    osNpcStopAnimation(npc,lastAnim);
-    lastAnim = anima;
-}
-
-Sound()
-{
-    if (llFrand(2) > 0.5)
-        return;
-        
-    integer n = llGetInventoryNumber(INVENTORY_SOUND);
-    integer n2 = llCeil(llFrand(n));
-
-    string name = llGetInventoryName(INVENTORY_SOUND,n2);
-    llTriggerSound(name,1.0);
-}
-
-
-walk_to_master(vector myPos)
-{
-    vector myVector = <randBetween(-2,2),randBetween(-2,2),myPos.z> ;
-    myPos.z = 0;
-
-    iWaitCounter = 60;
-    Play("Walk");
-    osNpcMoveToTarget(npc, myPos + myVector, OS_NPC_NO_FLY );
-    llSetTimerEvent(0.5);
-    Sound();
-}
-
-float randBetween(float min, float max)
-{
-    return llFrand(max - min) + min ;
-}
-dialog()
-{
-    channel = llCeil(llFrand(5000) + 5000);
-    listener = llListen(channel,"","","");
-    llDialog(llGetOwner(), "Choose:",["Start","Remove","Appearance"],channel);
-}
-Start()
-{
-    vector npcPos = llGetPos() + <1.0,1.0,1.0>;
-    npc = osNpcCreate(fName,lName, npcPos, "Appearance");
-    llSetObjectDesc(npc);
-    npc_on = TRUE;
-    llSensor("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI);  
-}
-
-default
-{ 
-    
-    state_entry()
-    {
-        llSay(0,"Ready");
-         osNpcRemove(llGetObjectDesc());
-         dialog();
-    }
-    
-    changed (integer what)
-    {
-        if (what & CHANGED_REGION_START)
+        if (llVecDist(Npcpos, Dest ) < claw_distance) 
         {
-            if (npc_on)
-            {
-                Start();
-            }
-        } 
-    }
-    
-    on_rez(integer p)
-    {
-        llResetScript();
-    }
-    
-    touch_start(integer x)
-    {
-        if (llDetectedKey(0) == llGetOwner())  {
-            dialog();
-        }
-    }
-    
-    listen(integer channel, string name, key id, string msg) {
-        llListenRemove (listener);
-        if (msg == "Start")
-        {
-            if( !npc_on ) {
-               Start();
-            } else {
-                llOwnerSay("Already running");
-            }
-        } else if (msg == "Remove")  {
-            npc_on = FALSE;
-            osNpcRemove(llGetObjectDesc());
-            llSetTimerEvent(0);
-        } else if (msg ==  "Appearance") {
-            osAgentSaveAppearance(llGetOwner(), "Appearance");
-            llOwnerSay("Your appearance has been saved");
-        }
-    
-    }
-
-    sensor(integer num)
-    {
-        Dest = llDetectedPos( 0 );
-        walk_to_master(Dest);
-    }
-    no_sensor()
-    {
-         Play("Stand");
-         llSleep(10);
-         llSensor("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI);
-    }
-   
-    timer()
-    {
-        vector pos;
-        if (--iWaitCounter)  {
-           
-            list Poses = llGetObjectDetails(npc,[OBJECT_POS]);
-            pos = llList2Vector(Poses, 0);
-            
-            if (llVecDist(pos, Dest ) > 4) {
-                return;
-            }
-        }
-        
-        if (llFrand(5) < 0.5) { 
-             if (llVecDist(pos, Dest ) <1) {
-                Play("Claw");
-                llTriggerSound("kitten4",1.0);
-                llSleep(1.5);
-            } else {
-                Play("Meow");
-                llTriggerSound("kitten3",1.0);
-                llSleep(1.5);
-            }
-            
-            
-        } 
-        
-        Play("Stand");
-
-        llSleep(llFrand(5) + 1);
-        llSetTimerEvent(0);
-        llSensor("", NULL_KEY, AGENT_BY_LEGACY_NAME, max_distance, PI);
-        
+            Play("Claw");
+            llTriggerSound("kitten4",1.0);
+        }  else {
+            Play("Stand");
+        }   
     }
 }