Formatting and linking improvements