Bug and typo fixes

Converted some shop stuff to check for NPC class instead of name string.