Miscellaneous edits
Update changelog for 1.2.5 release