Formatting and small fixes.