Formatting, fixes and updates.