Updated info and links