Formatting and corrections