updates to some core files