add some links and some cleanup