Formatting and small corrections