Add links and some cleanup/wording