tweaked link handling