Formating and other small fixes.