Fix missing imports
Add PDF links. Refactor URI handling