reworked out links, closes #1242