NPC fix

NPC now works, but collision detection is still needed.