NPC Fixes

Fixed NPC behavioral bugs, and completed basic commands