small changes on the core