Comments in generateGuild, and mapping changes