some NPCID updates, minor clean-up/fixes
Merge pull request #493 from Killeon/master

some NPCID updates, minor clean-up & fixes