more links and fixes