Fix links and some formatting