Edited pdf files to make links work, hopefully fixed some typos
merge changes from upstream