improvements to content and core loading code