Small tweaks with villages and events