Fix some formatting issues and update the documentation