More links and fixes