REALLY Fixed the village crash

Also some different village behaviour.