More CivCraft work plus minor changes.