Formatting, and small corrections