Various tweaks, core geometry control improvements