fixes multiple issues (broken links to be deleted)

fixes #738
fixes #727
fixes #725
Merge pull request #838 from borgified/fix_738

fixes multiple issues (broken links to be deleted)