more links, better formatting