Formatting and other small fixes.