Some modifications and edits to our core.