More formatting and link fixes