Final updates to entry-header