verify/update links and polish