Link attributions and minor changes