Pull request for NPCs and numbers

Yay, the things mentioned in the title!