links fixes & some updates