clean up part 2, also improved external links