Link in title, other improvements