Formatting. Various small fixes.