Link user names, other slight tweaks