Sweeten terminology
Add some sanity checking on core extraction