Fix up some formatting issues and some links