fixes multiple issues (broken links to be deleted)

fixes #738
fixes #727
fixes #725