Various minor formatting issues and typos