Update changelog with references to changes.
Avoid trailing comments
Fix indent
Prefer packaging library if available.