Added links and tidied up