Small changes to Core. Big improvement to Console