add links, keyywords, correct typeos
merge