Adding links to pages, and other misc. clean-up.