link and some rewrites