slight Core refactoring; slight stats improvements