Updated some URLs and addresses