Minor tweaks, getting ready to overhaul domain creation