Corrections and improvements of the core feature