Fix bug - allow root to root links. Minor updates.