Added more links; and formatting