Fix formatting, include suggested changes and previously missing info.