Updated Links and more