Minor improvements to the Village and Villagers