some more links and fixes