Fifth round of fixes

* Enumerated Villager spawning