Builder tweaks, link fixes,