improve formatting and fix some comments
Fix syntax and formatting issue in diffs
Improve bump messages