Little fixes and formatting.