Add links; more cleanup