Merge "Fix formatting, use consistent comment styles, and document more fields." into main