Minor content and template updates