Small changes to the core and adding some loggers.