Fix links. Fix some formatting