General fixes to contents and structure