Various modifications to improve linking and readability