More core edits

More core edits