New links, some formatting cleanup