Updated main links. Changed some terminology.