Minor cosmetics and fix to html links