Bulk of changes to pre-release candidate