More NPC Class Fixes

That ^^