Adding some wards and hexes against premature entry-creation.
Moving some stuff around.