Minor tweaks and fixes to contenttype.yml