Fixed 'intern'. Reworked entry and return templates.