Added auto-linking in results; misc. cleanup