hand merge edits from PR
fix formatting
remove
rename
fix date issue
tweak
one more time
trim summary