copyright: Updated following recent edits