Added links and other tweaks