Fix more broken links and updates to new  framework.