Formatting and further small fixes.