many fixes to content and links