Fixing more links and other non-sense