some core 'improvements'