overwrite issues

+link fixes