Npc modifications

Made some minor changes to the Npc system and did some more work on the
Npc Movement. Still incomplete and is currently disabled.