Update the CHANGELOG and fix some trailing ws.