updated most links