Marcus' core updates.
8 files changed