Improving links and fixes